From 17c8ed9ebcb225e6aa87a86671b472e586baefb3 Mon Sep 17 00:00:00 2001 From: Redecouverte Date: Thu, 24 Feb 2011 12:42:20 +0100 Subject: [PATCH] fixed typo in getRegionManager --- .../bukkit/WorldGuardBlockListener.java | 4 +-- .../bukkit/WorldGuardEntityListener.java | 13 +++++---- .../bukkit/WorldGuardPlayerListener.java | 2 +- .../worldguard/bukkit/WorldGuardPlugin.java | 28 +++++++++---------- .../regionmanager/GlobalRegionManager.java | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java index 22556dad..054353ec 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java @@ -387,7 +387,7 @@ public void onBlockInteract(BlockInteractEvent event) { if (plugin.useRegions) { Vector pt = toVector(block); LocalPlayer localPlayer = plugin.wrapPlayer(player); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(player.getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(player.getWorld().getName()); if (!plugin.hasPermission(player, "/regionbypass") && !mgr.getApplicableRegions(pt).allowsFlag(AreaFlags.FLAG_CHEST_ACCESS) @@ -474,7 +474,7 @@ public void onBlockRightClick(BlockRightClickEvent event) { if (plugin.useRegions && event.getItemInHand().getTypeId() == plugin.regionWand) { Vector pt = toVector(blockClicked); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(player.getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(player.getWorld().getName()); ApplicableRegionSet app = mgr.getApplicableRegions(pt); List regions = mgr.getApplicableRegionsIDs(pt); diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java index 6ad769a6..86a8170c 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java @@ -53,6 +53,7 @@ public WorldGuardEntityListener(WorldGuardPlugin plugin) { public void onEntityDamageByBlock(EntityDamageByBlockEvent event) { + Entity defender = event.getEntity(); DamageCause type = event.getCause(); @@ -92,7 +93,7 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { if (attacker != null && attacker instanceof Player) { if (plugin.useRegions) { Vector pt = toVector(defender.getLocation()); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(player.getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(player.getWorld().getName()); if (!mgr.getApplicableRegions(pt) .allowsFlag(AreaFlags.FLAG_PVP)) { @@ -111,7 +112,7 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { if (plugin.useRegions) { Vector pt = toVector(defender.getLocation()); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(player.getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(player.getWorld().getName()); if (!mgr.getApplicableRegions(pt) .allowsFlag(AreaFlags.FLAG_MOB_DAMAGE)) { @@ -147,7 +148,7 @@ public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) { if (attacker != null && attacker instanceof Player) { if (plugin.useRegions) { Vector pt = toVector(defender.getLocation()); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(player.getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(player.getWorld().getName()); if (!mgr.getApplicableRegions(pt) .allowsFlag(AreaFlags.FLAG_PVP)) { @@ -160,7 +161,7 @@ public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) { if (attacker != null && attacker instanceof Skeleton) { if (plugin.useRegions) { Vector pt = toVector(defender.getLocation()); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(player.getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(player.getWorld().getName()); if (!mgr.getApplicableRegions(pt) .allowsFlag(AreaFlags.FLAG_MOB_DAMAGE)) { @@ -259,7 +260,7 @@ public void onEntityExplode(EntityExplodeEvent event) { if (plugin.useRegions) { Vector pt = toVector(event.getEntity().getLocation()); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(event.getEntity().getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(event.getEntity().getWorld().getName()); if (!mgr.getApplicableRegions(pt) .allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) { @@ -275,7 +276,7 @@ public void onEntityExplode(EntityExplodeEvent event) { if (plugin.useRegions && event.getEntity() != null) { Vector pt = toVector(event.getEntity().getLocation()); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(event.getEntity().getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(event.getEntity().getWorld().getName()); if (!mgr.getApplicableRegions(pt) .allowsFlag(AreaFlags.FLAG_TNT)) { diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index b48b6188..2b1fdd7c 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -137,7 +137,7 @@ public void onPlayerItem(PlayerItemEvent event) { if (plugin.useRegions && item != null && block != null && item.getTypeId() == 259) { Vector pt = toVector(block.getRelative(event.getBlockFace())); - RegionManager mgr = plugin.getGlobalRegionManager().getRegionmanager(player.getWorld().getName()); + RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(player.getWorld().getName()); if (!mgr.getApplicableRegions(pt) .allowsFlag(AreaFlags.FLAG_LIGHTER)) { diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index d91053a9..1d5e4c07 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -337,7 +337,7 @@ public void loadConfiguration() { logger.info("WorldGuard: Converting old regions.txt to new format...."); World w = this.getServer().getWorlds().get(0); - RegionManager mgr = globalRegionManager.getRegionmanager(w.getName()); + RegionManager mgr = globalRegionManager.getRegionManager(w.getName()); CSVDatabase db = new CSVDatabase(CSVfile); db.load(); @@ -816,7 +816,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) if (args.length >= 2) { region.setOwners(parseDomainString(args, 1)); } - RegionManager mgr = globalRegionManager.getRegionmanager(w.getName()); + RegionManager mgr = globalRegionManager.getRegionManager(w.getName()); mgr.addRegion(region); mgr.save(); player.sendMessage(ChatColor.YELLOW + "Region saved as " + id + "."); @@ -836,7 +836,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) try { String id = args[0].toLowerCase(); - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); ProtectedRegion existing = mgr.getRegion(id); @@ -885,7 +885,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) String id = args[0].toLowerCase(); String flagStr = args[1]; String stateStr = args[2]; - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); ProtectedRegion region = mgr.getRegion(id); if (region == null) { @@ -939,7 +939,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) String id = args[0].toLowerCase(); String parentId = args.length > 1 ? args[1].toLowerCase() : null; - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); ProtectedRegion region = mgr.getRegion(id); @@ -991,7 +991,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) checkRegionPermission(player, "/regioninfo"); checkArgs(args, 1, 1, "/region info "); - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); String id = args[0].toLowerCase(); if (!mgr.hasRegion(id)) { player.sendMessage(ChatColor.RED + "A region with ID '" @@ -1040,7 +1040,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) checkArgs(args, 2, -1, "/region add[member|owner] [player1 [group1 [players/groups...]]]"); boolean isOwner = action.equalsIgnoreCase("addowner"); - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); String id = args[0].toLowerCase(); if (!mgr.hasRegion(id)) { @@ -1085,7 +1085,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) checkArgs(args, 2, -1, "/region removeowner [owner1 [owner2 [owners...]]]"); boolean isOwner = action.equalsIgnoreCase("removeowner"); - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); String id = args[0].toLowerCase(); if (!mgr.hasRegion(id)) { @@ -1137,7 +1137,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) } } - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); Map regions = mgr.getRegions(); int size = regions.size(); int pages = (int)Math.ceil(size / (float)CMD_LIST_SIZE); @@ -1172,7 +1172,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) try { String id = args[0].toLowerCase(); - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); if (!mgr.hasRegion(id)) { player.sendMessage(ChatColor.RED + "A region with ID '" @@ -1204,7 +1204,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) checkArgs(args, 0, 0, "/region save"); try { - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); mgr.save(); player.sendMessage(ChatColor.YELLOW + "Region database saved to file!"); } catch (IOException e) { @@ -1220,7 +1220,7 @@ private boolean handleRegionCommand(Player player, String action, String[] args) checkArgs(args, 0, 0, "/region load"); try { - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); mgr.load(); player.sendMessage(ChatColor.YELLOW + "Region database loaded from file!"); } catch (IOException e) { @@ -1389,7 +1389,7 @@ public boolean canBuild(Player player, int x, int y, int z) { LocalPlayer localPlayer = wrapPlayer(player); if (!hasPermission(player, "/regionbypass")) { - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); if (!mgr.getApplicableRegions(pt).canBuild(localPlayer)) { return false; @@ -1408,7 +1408,7 @@ public boolean canBuild(Player player, Vector pt) { LocalPlayer localPlayer = wrapPlayer(player); if (!hasPermission(player, "/regionbypass")) { - RegionManager mgr = globalRegionManager.getRegionmanager(player.getWorld().getName()); + RegionManager mgr = globalRegionManager.getRegionManager(player.getWorld().getName()); if (!mgr.getApplicableRegions(pt).canBuild(localPlayer)) { return false; diff --git a/src/com/sk89q/worldguard/protection/regionmanager/GlobalRegionManager.java b/src/com/sk89q/worldguard/protection/regionmanager/GlobalRegionManager.java index 630d1f56..b4391686 100644 --- a/src/com/sk89q/worldguard/protection/regionmanager/GlobalRegionManager.java +++ b/src/com/sk89q/worldguard/protection/regionmanager/GlobalRegionManager.java @@ -63,7 +63,7 @@ private void loadWorld(String name) { } } - public RegionManager getRegionmanager(String worldName) { + public RegionManager getRegionManager(String worldName) { RegionManager ret = this.managers.get(worldName);