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

allow use SelectTool interact...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-09-22 17:05:41 +08:00
parent dc026b609a
commit 05e3cbf23f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
View File

@@ -293,20 +293,19 @@ public class ResidencePlayerListener implements Listener {
return; return;
PermissionGroup group = Residence.getPermissionManager().getGroup(player); PermissionGroup group = Residence.getPermissionManager().getGroup(player);
if (player.hasPermission("residence.select") || player.hasPermission("residence.create") && !player.isPermissionSet("residence.select") if (player.hasPermission("residence.select") || player.hasPermission("residence.create") && !player.isPermissionSet("residence.select")
|| group.canCreateResidences() && !player.isPermissionSet("residence.create") && !player.isPermissionSet("residence.select") || resadmin) { || group.canCreateResidences() && !player.isPermissionSet("residence.create") && !player.isPermissionSet("residence.select") || resadmin)
if (event.getAction() == Action.LEFT_CLICK_BLOCK) { if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
Location loc = block.getLocation(); Location loc = block.getLocation();
Residence.getSelectionManager().placeLoc1(player, loc); Residence.getSelectionManager().placeLoc1(player, loc);
player.sendMessage(ChatColor.GREEN + Residence.getLanguage().getPhrase("SelectPoint", Residence.getLanguage().getPhrase("Primary")) + ChatColor.RED + "(" + loc.getBlockX() player.sendMessage(ChatColor.GREEN + Residence.getLanguage().getPhrase("SelectPoint", Residence.getLanguage().getPhrase("Primary")) + ChatColor.RED + "(" + loc.getBlockX()
+ "," + loc.getBlockY() + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!"); + "," + loc.getBlockY() + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
event.setCancelled(true);
} else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { } else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
Location loc = block.getLocation(); Location loc = block.getLocation();
Residence.getSelectionManager().placeLoc2(player, loc); Residence.getSelectionManager().placeLoc2(player, loc);
player.sendMessage(ChatColor.GREEN + Residence.getLanguage().getPhrase("SelectPoint", Residence.getLanguage().getPhrase("Secondary")) + ChatColor.RED + "(" + loc.getBlockX() player.sendMessage(ChatColor.GREEN + Residence.getLanguage().getPhrase("SelectPoint", Residence.getLanguage().getPhrase("Secondary")) + ChatColor.RED + "(" + loc.getBlockX()
+ "," + loc.getBlockY() + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!"); + "," + loc.getBlockY() + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
} }
event.setCancelled(true);
}
} }
if (player.getItemInHand().getTypeId() == Residence.getConfigManager().getInfoToolID()) if (player.getItemInHand().getTypeId() == Residence.getConfigManager().getInfoToolID())
if (event.getAction() == Action.LEFT_CLICK_BLOCK) { if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
@@ -315,8 +314,7 @@ public class ResidencePlayerListener implements Listener {
if (res != null) { if (res != null) {
Residence.getResidenceManager().printAreaInfo(res, player); Residence.getResidenceManager().printAreaInfo(res, player);
event.setCancelled(true); event.setCancelled(true);
} } else {
if (res == null) {
event.setCancelled(true); event.setCancelled(true);
player.sendMessage(Residence.getLanguage().getPhrase("NoResHere")); player.sendMessage(Residence.getLanguage().getPhrase("NoResHere"));
} }