diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 274640d..284c281 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index f5a4add..4349150 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper -version: 3.7.0 +version: 3.7.0r1 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 be2577e..4acf679 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -2658,14 +2658,16 @@ public class GenericFunctions { } public static void subtractHealth(final LivingEntity entity, double dmg) { - if (entity.getHealth()>dmg) { - entity.setHealth(entity.getHealth()-dmg); - } else { - /*List drops = new ArrayList(); - EntityDeathEvent ev = new EntityDeathEvent(entity,drops); - Bukkit.getPluginManager().callEvent(ev); - entity.setHealth(0);*/ - entity.damage(Integer.MAX_VALUE); + if (!entity.hasPotionEffect(PotionEffectType.GLOWING) && entity instanceof Player) { + if (entity.getHealth()>dmg) { + entity.setHealth(entity.getHealth()-dmg); + } else { + /*List drops = new ArrayList(); + EntityDeathEvent ev = new EntityDeathEvent(entity,drops); + Bukkit.getPluginManager().callEvent(ev); + entity.setHealth(0);*/ + entity.damage(Integer.MAX_VALUE); + } } } diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index 3e6256d..0b673c0 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -3646,7 +3646,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { } break; } - } + } //If glowing, the player is invulnerable. if (p.hasPotionEffect(PotionEffectType.GLOWING)) {