502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-25 21:56:06 +00:00
Code Releases Activity

修复领地管理无法TP的问题...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-12-08 21:01:00 +08:00
parent a9850013f3
commit 437118aef4
3 changed files with 35 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java
View File

@@ -21,8 +21,8 @@ import com.bekvon.bukkit.residence.event.ResidenceTPEvent;
import cn.citycraft.Residence.ResidenceMain;
import cn.citycraft.Residence.economy.ResidenceBank;
import cn.citycraft.Residence.economy.TransactionManager;
import cn.citycraft.Residence.itemlist.ResidenceItemList;
import cn.citycraft.Residence.itemlist.ItemList.ListType;
import cn.citycraft.Residence.itemlist.ResidenceItemList;
import cn.citycraft.Residence.permissions.PermissionGroup;
import cn.citycraft.Residence.text.help.InformationPager;
@@ -128,7 +128,7 @@ public class ClaimedResidence {
}
return false;
}
if (!resadmin && plugin.getConfigManager().getEnforceAreaInsideArea() && this.getParent() == null) {
if (!resadmin && plugin.getConfigManager().getEnforceAreaInsideArea() && getParent() == null) {
boolean inside = false;
for (final CuboidArea are : areas.values()) {
if (are.isAreaWithinArea(area)) {
@@ -234,7 +234,7 @@ public class ClaimedResidence {
}
return false;
}
if (!(this.containsLoc(loc1) && this.containsLoc(loc2))) {
if (!(containsLoc(loc1) && containsLoc(loc2))) {
if (player != null) {
player.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("SubzoneSelectInside"));
}
@@ -254,7 +254,7 @@ public class ClaimedResidence {
}
}
final PermissionGroup group = plugin.getPermissionManager().getGroup(player);
if (this.getZoneDepth() >= group.getMaxSubzoneDepth()) {
if (getZoneDepth() >= group.getMaxSubzoneDepth()) {
player.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("SubzoneMaxDepth"));
return false;
}
@@ -404,7 +404,7 @@ public class ClaimedResidence {
@SuppressWarnings("deprecation")
public Location getOutsideFreeLoc(final Location insideLoc) {
final int maxIt = 100;
final CuboidArea area = this.getAreaByLoc(insideLoc);
final CuboidArea area = getAreaByLoc(insideLoc);
if (area == null) {
return insideLoc;
}
@@ -453,7 +453,7 @@ public class ClaimedResidence {
public ArrayList<Player> getPlayersInResidence() {
final ArrayList<Player> within = new ArrayList<Player>();
for (final Player player : Bukkit.getServer().getOnlinePlayers()) {
if (this.containsLoc(player.getLocation())) {
if (containsLoc(player.getLocation())) {
within.add(player);
}
}
@@ -627,7 +627,7 @@ public class ClaimedResidence {
public void removeArea(final Player player, final String id, final boolean resadmin) {
if (this.getPermissions().hasResidencePermission(player, true) || resadmin) {
if (getPermissions().hasResidencePermission(player, true) || resadmin) {
if (!areas.containsKey(id)) {
player.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("AreaNonExist"));
return;
@@ -893,9 +893,9 @@ public class ClaimedResidence {
return;
}
if (enter) {
this.setEnterMessage(message);
setEnterMessage(message);
} else {
this.setLeaveMessage(message);
setLeaveMessage(message);
}
player.sendMessage(ChatColor.GREEN + plugin.getLanguage().getPhrase("MessageChange"));
}
@@ -913,7 +913,7 @@ public class ClaimedResidence {
player.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("NoPermission"));
return;
}
if (!this.containsLoc(player.getLocation())) {
if (!containsLoc(player.getLocation())) {
player.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("NotInResidence"));
return;
}
@@ -922,7 +922,7 @@ public class ClaimedResidence {
}
public void tpToResidence(final Player reqPlayer, final Player targetPlayer, final boolean resadmin) {
if (!resadmin) {
if (!resadmin && !reqPlayer.hasPermission("residence.admin.tp")) {
final PermissionGroup group = plugin.getPermissionManager().getGroup(reqPlayer);
if (!group.hasTpAccess()) {
reqPlayer.sendMessage(ChatColor.RED + plugin.getLanguage().getPhrase("TeleportDeny"));
@@ -947,10 +947,10 @@ public class ClaimedResidence {
} else {
final CuboidArea area = areas.values().iterator().next();
if (area == null) {
reqPlayer.sendMessage(ChatColor.RED + "Could not find area to teleport to...");
reqPlayer.sendMessage(ChatColor.RED + "未找到可传送的区域...");
return;
}
final Location targloc = this.getOutsideFreeLoc(area.getHighLoc());
final Location targloc = getOutsideFreeLoc(area.getHighLoc());
final ResidenceTPEvent tpevent = new ResidenceTPEvent(this, targloc, targetPlayer, reqPlayer);
Bukkit.getServer().getPluginManager().callEvent(tpevent);
if (!tpevent.isCancelled()) {