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

Only enable teleport protection on plugin/command caused teleport events.

Browse Source
This commit is contained in:
KHobbits
2014-03-09 01:13:41 +00:00
parent 28ec7c2d80
commit 1be30e4a0a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,7 +405,7 @@ public class EssentialsPlayerListener implements Listener
{
user.setLastLocation();
}
if (teleportInvulnerability)
if (teleportInvulnerability && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
{
user.enableInvulnerabilityAfterTeleport();
}

4
Essentials/src/com/earth2me/essentials/Teleport.java
View File

@@ -110,7 +110,7 @@ public class Teleport implements net.ess3.api.ITeleport
{
teleportee.getBase().leaveVehicle();
}
teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, loc));
teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, loc), cause);
}
else
{
@@ -123,7 +123,7 @@ public class Teleport implements net.ess3.api.ITeleport
{
teleportee.getBase().leaveVehicle();
}
teleportee.getBase().teleport(LocationUtil.getRoundedDestination(loc));
teleportee.getBase().teleport(LocationUtil.getRoundedDestination(loc), cause);
}
}