From d9c80e8825841e04c5870c9c287fa2750d59e308 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Wed, 9 Dec 2015 12:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=89TP=E6=B2=A1=E6=9C=89?= =?UTF-8?q?MOVE=E6=9D=83=E9=99=90=E7=9A=84=E4=BA=BA=E4=BC=A0=E9=80=81?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 502647092 --- .../Residence/listeners/ResidencePlayerListener.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java index d72bd30..b9c3820 100644 --- a/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java +++ b/src/main/java/cn/citycraft/Residence/listeners/ResidencePlayerListener.java @@ -504,8 +504,11 @@ public class ResidencePlayerListener implements Listener { final Player player = event.getPlayer(); final ClaimedResidence res = plugin.getResidenceManager().getByLoc(loc); if (res != null) { - final String areaname = res.getName(); - if (!plugin.isResAdminOn(player) && !res.getPermissions().playerHas(player.getName(), "tp", true) && !player.hasPermission("residence.admin.tp")) { + 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 { + final String areaname = res.getName(); event.setCancelled(true); player.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("TeleportDeny", areaname)); return;