From cfaf955e9a60e410d7bc83223d95231b05de6402 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sun, 26 Jan 2014 20:51:37 -0600 Subject: [PATCH] Add TeleportCause.PLUGIN indicator to the teleport methods used by border knockback, so other plugins can see that the teleport was triggered by a plugin and potentially not interfere if they otherwise would have Specifically, this should hopefully take care of CombatTag preventing WorldBorder knockback if the player is considered to be in combat --- src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java b/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java index c3bf583..6f0e454 100644 --- a/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java +++ b/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java @@ -5,12 +5,12 @@ import java.util.LinkedHashSet; import java.util.Set; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.entity.Boat; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.Location; import org.bukkit.util.Vector; import org.bukkit.World; @@ -87,7 +87,7 @@ public class BorderCheckTask implements Runnable else { ride.setVelocity(new Vector(0, 0, 0)); - ride.teleport(rideLoc); + ride.teleport(rideLoc, TeleportCause.PLUGIN); } if (Config.RemountTicks() > 0) @@ -102,7 +102,7 @@ public class BorderCheckTask implements Runnable Config.showWhooshEffect(loc); if (!returnLocationOnly) - player.teleport(newLoc); + player.teleport(newLoc, TeleportCause.PLUGIN); if (!handlingVehicle) handlingPlayers.remove(player.getName().toLowerCase());