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

cancel event while select residence...

Browse Source 
Signed-off-by: j502647092 <jtb1@163.com>
This commit is contained in:
j502647092
2015-06-12 00:00:03 +08:00
parent ff52e6dc09
commit 24127af11f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,8 +196,8 @@ public class ResidencePlayerListener implements Listener {
ActionBar.send( ActionBar.send(
player, player,
(new StringBuilder()).append(ChatColor.YELLOW) (new StringBuilder()).append(ChatColor.YELLOW)
.append(insertMessages(player, areaname, res, enterMessage)) .append(insertMessages(player, areaname, res, enterMessage))
.toString()); .toString());
} else { } else {
player.sendMessage(ChatColor.YELLOW player.sendMessage(ChatColor.YELLOW
+ this.insertMessages(player, areaname, res, enterMessage)); + this.insertMessages(player, areaname, res, enterMessage));
@@ -245,7 +245,7 @@ public class ResidencePlayerListener implements Listener {
|| mat == Material.PISTON_STICKY_BASE || mat == Material.PISTON_STICKY_BASE
|| mat == Material.DRAGON_EGG || mat == Material.DRAGON_EGG
|| Residence.getConfigManager().getCustomBothClick() || Residence.getConfigManager().getCustomBothClick()
.contains(Integer.valueOf(block.getTypeId())); .contains(Integer.valueOf(block.getTypeId()));
} }
private boolean isCanUseEntity_RClickOnly(Material mat, Block block) { private boolean isCanUseEntity_RClickOnly(Material mat, Block block) {
@@ -264,14 +264,14 @@ public class ResidencePlayerListener implements Listener {
|| mat == Material.BREWING_STAND || mat == Material.BREWING_STAND
|| mat == Material.ENCHANTMENT_TABLE || mat == Material.ENCHANTMENT_TABLE
|| Residence.getConfigManager().getCustomRightClick() || Residence.getConfigManager().getCustomRightClick()
.contains(Integer.valueOf(block.getTypeId())); .contains(Integer.valueOf(block.getTypeId()));
} }
private boolean isContainer(Material mat, Block block) { private boolean isContainer(Material mat, Block block) {
return FlagPermissions.getMaterialUseFlagList().containsKey(mat) return FlagPermissions.getMaterialUseFlagList().containsKey(mat)
&& FlagPermissions.getMaterialUseFlagList().get(mat).equals("container") && FlagPermissions.getMaterialUseFlagList().get(mat).equals("container")
|| Residence.getConfigManager().getCustomContainers() || Residence.getConfigManager().getCustomContainers()
.contains(Integer.valueOf(block.getTypeId())); .contains(Integer.valueOf(block.getTypeId()));
} }
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
@@ -415,17 +415,18 @@ public class ResidencePlayerListener implements Listener {
player.sendMessage(ChatColor.GREEN player.sendMessage(ChatColor.GREEN
+ Residence.getLanguage().getPhrase("SelectPoint", + Residence.getLanguage().getPhrase("SelectPoint",
Residence.getLanguage().getPhrase("Primary")) Residence.getLanguage().getPhrase("Primary"))
+ ChatColor.RED + "(" + loc.getBlockX() + "," + loc.getBlockY() + ChatColor.RED + "(" + loc.getBlockX() + "," + loc.getBlockY()
+ "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!"); + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
} 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 player.sendMessage(ChatColor.GREEN
+ Residence.getLanguage().getPhrase("SelectPoint", + Residence.getLanguage().getPhrase("SelectPoint",
Residence.getLanguage().getPhrase("Secondary")) Residence.getLanguage().getPhrase("Secondary"))
+ ChatColor.RED + "(" + loc.getBlockX() + "," + loc.getBlockY() + ChatColor.RED + "(" + loc.getBlockX() + "," + loc.getBlockY()
+ "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!"); + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
} }
event.setCancelled(true);
} }
} }
if (player.getItemInHand().getTypeId() == Residence.getConfigManager().getInfoToolID()) { if (player.getItemInHand().getTypeId() == Residence.getConfigManager().getInfoToolID()) {
@@ -451,7 +452,7 @@ public class ResidencePlayerListener implements Listener {
|| player.getItemInHand().getData().getData() == 3 || player.getItemInHand().getData().getData() == 3
&& block.getTypeId() == 17 && block.getTypeId() == 17
&& (block.getData() == 3 || block.getData() == 7 && (block.getData() == 3 || block.getData() == 7
|| block.getData() == 11 || block.getData() == 15)) { || block.getData() == 11 || block.getData() == 15)) {
perms = Residence.getPermsByLocForPlayer( perms = Residence.getPermsByLocForPlayer(
block.getRelative(event.getBlockFace()).getLocation(), block.getRelative(event.getBlockFace()).getLocation(),
player); player);