From 43d9579e86dfd3a7faa6cb31a627017429d7082a Mon Sep 17 00:00:00 2001 From: 502647092 Date: Thu, 17 Mar 2016 22:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6=E4=BC=A0?= =?UTF-8?q?=E9=80=81=E6=8B=A6=E6=88=AA=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= =?UTF-8?q?...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../citycraft/Residence/listeners/ResidencePlayerListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java index d1cf290..37ea7ae 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java @@ -33,6 +33,7 @@ import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.Plugin; import com.bekvon.bukkit.residence.event.ResidenceChangedEvent; @@ -502,7 +503,7 @@ public class ResidencePlayerListener implements Listener { if (plugin.isResAdminOn(player) || ((res.getPermissions().playerHas(player.getName(), "tp", true) || player.hasPermission("residence.admin.tp")) && (res.getPermissions().playerHas(player.getName(), "move", true) || player.hasPermission("residence.admin.move")))) { handleNewLocation(player, loc, false); - } else { + } else if (event.getCause() != TeleportCause.PLUGIN) { final String areaname = res.getName(); event.setCancelled(true); player.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("TeleportDeny", areaname));