diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 569fb83..6236841 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index dac5b78..a991461 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper -version: 3.7.3br1 +version: 3.7.3br2 commands: money: description: Tells the player the amount of money they are holding. diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index 2a4138a..f12c8af 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -2794,7 +2794,7 @@ public class GenericFunctions { //Bukkit.getPluginManager().callEvent(new EntityDamageByEntityEvent(damager,entity,DamageCause.CUSTOM,dmg+TwosideKeeper.CUSTOM_DAMAGE_IDENTIFIER)); } else { //Use old system if we cannot get a valid damager. - if (entity.getHealth()>dmg) { + if (entity.getHealth()>dmg) { entity.setHealth(entity.getHealth()-dmg); aPlugin.API.sendEntityHurtAnimation(entity); } else { diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index d2b7c59..9558fe3 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -4010,6 +4010,10 @@ public class TwosideKeeper extends JavaPlugin implements Listener { ev.setDamage(DamageModifier.BASE,storeddmg-CUSTOM_DAMAGE_IDENTIFIER); ev.setDamage(storeddmg-CUSTOM_DAMAGE_IDENTIFIER); log("New Damage: "+ev.getFinalDamage(),4); + if (ev.getEntity() instanceof Monster && + ev.getDamager() instanceof Player) { + NewCombat.addMonsterToTargetList((Monster)ev.getEntity(), (Player)ev.getDamager()); + } } else { double dmg = 0.0; if (ev.getEntity() instanceof Player) {