minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-09 08:06:54 +02:00
Code Issues Releases Wiki Activity

Ignore self damage in teleport entity protection.

Browse Source
This commit is contained in:
KHobbits
2012-12-29 07:35:26 +00:00
parent adfa7b8739
commit 092850792f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
View File

@@ -75,7 +75,7 @@ public class EssentialsEntityListener implements Listener
event.setCancelled(true); event.setCancelled(true);
} }
if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport()) if (!attacker.equals(defender) && (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport()))
{ {
event.setCancelled(true); event.setCancelled(true);
} }

2
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View File

@@ -233,7 +233,7 @@ public class EssentialsProtectEntityListener implements Listener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
// This code will prevent explosions near protected rails, signs or protected chests // This code will prevent explosions near protected rails, signs or protected chests
// TODO: Use protect db instead of this code // TODO: Use protect db instead of this code