diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 77b872f..436f8da 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index ab5ae3f..d732cad 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -2627,13 +2627,14 @@ public class GenericFunctions { } aPlugin.API.sendEntityHurtAnimation(target); TwosideKeeper.log("Call event with "+dmg, 5); - if (damager!=null) { - if (!(damager instanceof Monster) || !(target instanceof Monster)) { - TwosideKeeper.log(GenericFunctions.GetEntityDisplayName(damager)+"->"+ + LivingEntity shooter = NewCombat.getDamagerEntity(damager); + if (shooter!=null) { + if (!(shooter instanceof Monster) || !(target instanceof Monster)) { + TwosideKeeper.log(GenericFunctions.GetEntityDisplayName(shooter)+"->"+ GenericFunctions.GetEntityDisplayName(target)+ChatColor.WHITE+": Damage dealt was "+dmg,2); } } else { - if (!(damager instanceof Monster) || !(target instanceof Monster)) { + if (!(target instanceof Monster)) { TwosideKeeper.log(reason+"->"+ GenericFunctions.GetEntityDisplayName(target)+ChatColor.WHITE+": Damage dealt was "+dmg,2); } diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java b/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java index 5d5176e..25b7be3 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java @@ -254,7 +254,7 @@ public enum MonsterDifficulty { double randomness = Math.random(); TwosideKeeper.log(ChatColor.DARK_GREEN+" Randomness is "+randomness, 3); if (randomness<=0.2) { - TwosideKeeper.log(ChatColor.DARK_GREEN+" Spawn a core!", 3); + TwosideKeeper.log(ChatColor.DARK_GREEN+" Spawn a Core!", 3); switch (this) { case DANGEROUS: droplist.add(sig.plugin.TwosideKeeper.Artifact.createArtifactItem(ArtifactItem.ANCIENT_CORE)); @@ -273,7 +273,10 @@ public enum MonsterDifficulty { } } } - if (Math.random()<=0.6) { + randomness = Math.random(); + TwosideKeeper.log(ChatColor.DARK_GREEN+" Randomness is "+randomness, 3); + if (randomness<=0.6) { + TwosideKeeper.log(ChatColor.DARK_GREEN+" Spawn a Mysterious Essence!", 3); switch (this) { case NORMAL: droplist.add(sig.plugin.TwosideKeeper.Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE));