From fc89867e4aa83e4124363431c1cf326ba8315a17 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 29 Dec 2012 07:35:26 +0000 Subject: Ignore self damage in teleport entity protection. --- Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java | 2 +- .../earth2me/essentials/protect/EssentialsProtectEntityListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index e93c61952..74a8654a0 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -75,7 +75,7 @@ public class EssentialsEntityListener implements Listener event.setCancelled(true); } - if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport()) + if (!attacker.equals(defender) && (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())) { event.setCancelled(true); } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index 1ca9519ce..4770248b9 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -233,7 +233,7 @@ public class EssentialsProtectEntityListener implements Listener event.setCancelled(true); return; } - + // This code will prevent explosions near protected rails, signs or protected chests // TODO: Use protect db instead of this code -- cgit v1.2.3