diff --git a/src/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java b/src/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
index 816d367..76d00af 100644
--- a/src/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
+++ b/src/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
@@ -1,6 +1,5 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * To change this template, choose Tools | Templates and open the template in the editor.
  */
 
 package com.bekvon.bukkit.residence.listeners;
@@ -51,7 +50,7 @@ import com.bekvon.bukkit.residence.utils.ActionBar;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 
 /**
- * 
+ *
  * @author Administrator
  */
 @SuppressWarnings("deprecation")
@@ -76,69 +75,178 @@ public class ResidencePlayerListener implements Listener {
 		}
 	}
 
-	public void reload() {
-		currentRes = new HashMap<String, String>();
-		lastUpdate = new HashMap<String, Long>();
-		lastOutsideLoc = new HashMap<String, Location>();
-		playerToggleChat = new ArrayList<String>();
-		minUpdateTime = Residence.getConfigManager().getMinMoveUpdateInterval();
-		chatenabled = Residence.getConfigManager().chatEnabled();
-		for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-			lastUpdate.put(player.getName(), System.currentTimeMillis());
+	public void doHeals() {
+		try {
+			for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+				String resname = Residence.getPlayerListener().getCurrentResidenceName(
+						player.getName());
+				ClaimedResidence res = null;
+				if (resname != null) {
+					res = Residence.getResidenceManager().getByName(resname);
+				}
+				if (res != null && res.getPermissions().has("healing", false)) {
+					Damageable damage = player;
+					double health = damage.getHealth();
+					if (health < 20 && !player.isDead()) {
+						player.setHealth(health + 1);
+					}
+				}
+			}
+		} catch (Exception ex) {
 		}
 	}
 
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerQuit(PlayerQuitEvent event) {
-		String pname = event.getPlayer().getName();
-		currentRes.remove(pname);
-		lastUpdate.remove(pname);
-		lastOutsideLoc.remove(pname);
-		Residence.getChatManager().removeFromChannel(pname);
+	public String getCurrentResidenceName(String player) {
+		return currentRes.get(player);
 	}
 
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onPlayerJoin(PlayerJoinEvent event) {
-		Player player = event.getPlayer();
-		lastUpdate.put(player.getName(), 0L);
-		if (Residence.getPermissionManager().isResidenceAdmin(player)) {
-			Residence.turnResAdminOn(player);
-		}
-		handleNewLocation(player, player.getLocation(), false);
-	}
+	public void handleNewLocation(Player player, Location loc, boolean move) {
+		String pname = player.getName();
 
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onPlayerSpawn(PlayerRespawnEvent event) {
-		Location loc = event.getRespawnLocation();
-		Boolean bed = event.isBedSpawn();
-		Player player = event.getPlayer();
 		ClaimedResidence res = Residence.getResidenceManager().getByLoc(loc);
-		if (res == null) {
-			return;
-		}
-		if (res.getPermissions().playerHas(player.getName(), "move", true)) {
-			return;
-		}
-		if (bed) {
-			loc = player.getWorld().getSpawnLocation();
-		}
-		res = Residence.getResidenceManager().getByLoc(loc);
+		String areaname = null;
+		boolean chatchange = false;
+		String subzone = null;
 		if (res != null) {
-			if (!res.getPermissions().playerHas(player.getName(), "move", true)) {
-				loc = res.getOutsideFreeLoc(loc);
+			areaname = Residence.getResidenceManager().getNameByLoc(loc);
+			while (res.getSubzoneByLoc(player.getLocation()) != null) {
+				subzone = res.getSubzoneNameByLoc(player.getLocation());
+				res = res.getSubzoneByLoc(player.getLocation());
+				areaname = areaname + "." + subzone;
 			}
 		}
-		player.sendMessage(ChatColor.RED
-				+ Residence.getLanguage().getPhrase("NoSpawn"));
-		event.setRespawnLocation(loc);
+		ClaimedResidence ResOld = null;
+		if (currentRes.containsKey(pname)) {
+			ResOld = Residence.getResidenceManager().getByName(currentRes.get(pname));
+			if (ResOld == null) {
+				currentRes.remove(pname);
+			}
+		}
+		if (res == null) {
+			lastOutsideLoc.put(pname, loc);
+			if (ResOld != null) {
+				String leave = ResOld.getLeaveMessage();
+				/*
+				 * TODO - ResidenceLeaveEvent is deprecated as of 21-MAY-2013. Its functionality is
+				 * replaced by ResidenceChangedEvent. For now, this event is still supported until
+				 * it is removed at a suitable time in the future.
+				 */
+				ResidenceLeaveEvent leaveevent = new ResidenceLeaveEvent(ResOld, player);
+				Residence.getServ().getPluginManager().callEvent(leaveevent);
+
+				// New ResidenceChangeEvent
+				ResidenceChangedEvent chgEvent = new ResidenceChangedEvent(ResOld, null, player);
+				Residence.getServ().getPluginManager().callEvent(chgEvent);
+
+				if (leave != null && !leave.equals("")) {
+					if (Residence.getConfigManager().useActionBar()) {
+						ActionBar.send(player, (new StringBuilder()).append(ChatColor.YELLOW)
+								.append(insertMessages(player, ResOld.getName(), ResOld, leave))
+								.toString());
+					} else {
+						player.sendMessage(ChatColor.YELLOW
+								+ this.insertMessages(player, ResOld.getName(), ResOld, leave));
+					}
+				}
+				currentRes.remove(pname);
+				Residence.getChatManager().removeFromChannel(pname);
+			}
+			return;
+		}
+		if (move) {
+			if (!res.getPermissions().playerHas(pname, "move", true)
+					&& !Residence.isResAdminOn(player)
+					&& !player.hasPermission("residence.admin.move")) {
+				Location lastLoc = lastOutsideLoc.get(pname);
+				if (lastLoc != null) {
+					player.teleport(lastLoc);
+				} else {
+					player.teleport(res.getOutsideFreeLoc(loc));
+				}
+				player.sendMessage(ChatColor.RED
+						+ Residence.getLanguage().getPhrase("ResidenceMoveDeny",
+								res.getName().split("\\.")[res.getName().split("\\.").length - 1]));
+				return;
+			}
+		}
+		lastOutsideLoc.put(pname, loc);
+		if (!currentRes.containsKey(pname) || ResOld != res) {
+			currentRes.put(pname, areaname);
+			if (subzone == null) {
+				chatchange = true;
+			}
+
+			// "from" residence for ResidenceChangedEvent
+			ClaimedResidence chgFrom = null;
+			if (ResOld != res && ResOld != null) {
+				String leave = ResOld.getLeaveMessage();
+				chgFrom = ResOld;
+
+				/*
+				 * TODO - ResidenceLeaveEvent is deprecated as of 21-MAY-2013. Its functionality is
+				 * replaced by ResidenceChangedEvent. For now, this event is still supported until
+				 * it is removed at a suitable time in the future.
+				 */
+				ResidenceLeaveEvent leaveevent = new ResidenceLeaveEvent(ResOld, player);
+				Residence.getServ().getPluginManager().callEvent(leaveevent);
+
+				if (leave != null && !leave.equals("") && ResOld != res.getParent()) {
+					if (Residence.getConfigManager().useActionBar()) {
+						ActionBar.send(player, (new StringBuilder()).append(ChatColor.YELLOW)
+								.append(insertMessages(player, ResOld.getName(), ResOld, leave))
+								.toString());
+					} else {
+						player.sendMessage(ChatColor.YELLOW
+								+ this.insertMessages(player, ResOld.getName(), ResOld, leave));
+					}
+				}
+			}
+			String enterMessage = res.getEnterMessage();
+
+			/*
+			 * TODO - ResidenceEnterEvent is deprecated as of 21-MAY-2013. Its functionality is
+			 * replaced by ResidenceChangedEvent. For now, this event is still supported until it is
+			 * removed at a suitable time in the future.
+			 */
+			ResidenceEnterEvent enterevent = new ResidenceEnterEvent(res, player);
+			Residence.getServ().getPluginManager().callEvent(enterevent);
+
+			// New ResidenceChangedEvent
+			ResidenceChangedEvent chgEvent = new ResidenceChangedEvent(chgFrom, res, player);
+			Residence.getServ().getPluginManager().callEvent(chgEvent);
+
+			if (enterMessage != null && !enterMessage.equals("")
+					&& !(ResOld != null && res == ResOld.getParent())) {
+				if (Residence.getConfigManager().useActionBar()) {
+					ActionBar.send(
+							player,
+							(new StringBuilder()).append(ChatColor.YELLOW)
+							.append(insertMessages(player, areaname, res, enterMessage))
+									.toString());
+				} else {
+					player.sendMessage(ChatColor.YELLOW
+							+ this.insertMessages(player, areaname, res, enterMessage));
+				}
+			}
+		}
+		if (chatchange && chatenabled) {
+			Residence.getChatManager().setChannel(pname, areaname);
+		}
 	}
 
-	private boolean isContainer(Material mat, Block block) {
-		return FlagPermissions.getMaterialUseFlagList().containsKey(mat)
-				&& FlagPermissions.getMaterialUseFlagList().get(mat)
-						.equals("container")
-				|| Residence.getConfigManager().getCustomContainers()
-						.contains(Integer.valueOf(block.getTypeId()));
+	public String insertMessages(Player player, String areaname, ClaimedResidence res, String message) {
+		try {
+			message = message.replaceAll("%player", player.getName());
+			message = message.replaceAll("%owner", res.getPermissions().getOwner());
+			message = message.replaceAll("%residence", areaname);
+		} catch (Exception ex) {
+			return "";
+		}
+		return message;
+	}
+
+	private boolean isCanUseEntity(Material mat, Block block) {
+		return isCanUseEntity_BothClick(mat, block) || isCanUseEntity_RClickOnly(mat, block);
 	}
 
 	private boolean isCanUseEntity_BothClick(Material mat, Block block) {
@@ -162,7 +270,7 @@ public class ResidencePlayerListener implements Listener {
 				|| mat == Material.PISTON_STICKY_BASE
 				|| mat == Material.DRAGON_EGG
 				|| Residence.getConfigManager().getCustomBothClick()
-						.contains(Integer.valueOf(block.getTypeId()));
+				.contains(Integer.valueOf(block.getTypeId()));
 	}
 
 	private boolean isCanUseEntity_RClickOnly(Material mat, Block block) {
@@ -181,12 +289,88 @@ public class ResidencePlayerListener implements Listener {
 				|| mat == Material.BREWING_STAND
 				|| mat == Material.ENCHANTMENT_TABLE
 				|| Residence.getConfigManager().getCustomRightClick()
-						.contains(Integer.valueOf(block.getTypeId()));
+				.contains(Integer.valueOf(block.getTypeId()));
 	}
 
-	private boolean isCanUseEntity(Material mat, Block block) {
-		return isCanUseEntity_BothClick(mat, block)
-				|| isCanUseEntity_RClickOnly(mat, block);
+	private boolean isContainer(Material mat, Block block) {
+		return FlagPermissions.getMaterialUseFlagList().containsKey(mat)
+				&& FlagPermissions.getMaterialUseFlagList().get(mat).equals("container")
+				|| Residence.getConfigManager().getCustomContainers()
+				.contains(Integer.valueOf(block.getTypeId()));
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
+		Player player = event.getPlayer();
+		if (Residence.isResAdminOn(player))
+			return;
+		String pname = player.getName();
+		ClaimedResidence res = Residence.getResidenceManager().getByLoc(
+				event.getBlockClicked().getLocation());
+		if (res != null) {
+			if (Residence.getConfigManager().preventRentModify()
+					&& Residence.getConfigManager().enabledRentSystem()) {
+				if (Residence.getRentManager().isRented(res.getName())) {
+					player.sendMessage(ChatColor.RED
+							+ Residence.getLanguage().getPhrase("RentedModifyDeny"));
+					event.setCancelled(true);
+					return;
+				}
+			}
+		}
+		FlagPermissions perms = Residence.getPermsByLocForPlayer(event.getBlockClicked()
+				.getLocation(), player);
+		if (!perms.playerHas(pname, player.getWorld().getName(), "bucket",
+				perms.playerHas(pname, player.getWorld().getName(), "build", true))) {
+			player.sendMessage(ChatColor.RED
+					+ Residence.getLanguage().getPhrase("FlagDeny", "bucket"));
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onPlayerBucketFill(PlayerBucketFillEvent event) {
+		Player player = event.getPlayer();
+		String pname = player.getName();
+		if (Residence.isResAdminOn(player))
+			return;
+		ClaimedResidence res = Residence.getResidenceManager().getByLoc(
+				event.getBlockClicked().getLocation());
+		if (res != null) {
+			if (Residence.getConfigManager().preventRentModify()
+					&& Residence.getConfigManager().enabledRentSystem()) {
+				if (Residence.getRentManager().isRented(res.getName())) {
+					player.sendMessage(ChatColor.RED
+							+ Residence.getLanguage().getPhrase("RentedModifyDeny"));
+					event.setCancelled(true);
+					return;
+				}
+			}
+		}
+		FlagPermissions perms = Residence.getPermsByLocForPlayer(event.getBlockClicked()
+				.getLocation(), player);
+		boolean hasbucket = perms.playerHas(pname, player.getWorld().getName(), "bucket",
+				perms.playerHas(pname, player.getWorld().getName(), "build", true));
+		if (!hasbucket) {
+			player.sendMessage(ChatColor.RED
+					+ Residence.getLanguage().getPhrase("FlagDeny", "bucket"));
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onPlayerChat(AsyncPlayerChatEvent event) {
+		String pname = event.getPlayer().getName();
+		if (chatenabled && playerToggleChat.contains(pname)) {
+			String area = currentRes.get(pname);
+			if (area != null) {
+				ChatChannel channel = Residence.getChatManager().getChannel(area);
+				if (channel != null) {
+					channel.chat(pname, event.getMessage());
+				}
+				event.setCancelled(true);
+			}
+		}
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
@@ -194,32 +378,26 @@ public class ResidencePlayerListener implements Listener {
 		Player player = event.getPlayer();
 		Material heldItem = player.getItemInHand().getType();
 		Block block = event.getClickedBlock();
-		if (block == null) {
+		if (block == null)
 			return;
-		}
 		Material mat = block.getType();
 		if (!((isContainer(mat, block) || isCanUseEntity_RClickOnly(mat, block))
 				&& event.getAction() == Action.RIGHT_CLICK_BLOCK
 				|| isCanUseEntity_BothClick(mat, block) || event.getAction() == Action.PHYSICAL)) {
 			int typeId = player.getItemInHand().getTypeId();
 			if (typeId != Residence.getConfigManager().getSelectionTooldID()
-					&& typeId != Residence.getConfigManager().getInfoToolID()
-					&& typeId != 351 && typeId != 416) {
+					&& typeId != Residence.getConfigManager().getInfoToolID() && typeId != 351
+					&& typeId != 416)
 				return;
-			}
 		}
-		FlagPermissions perms = Residence.getPermsByLocForPlayer(
-				block.getLocation(), player);
+		FlagPermissions perms = Residence.getPermsByLocForPlayer(block.getLocation(), player);
 		String world = player.getWorld().getName();
-		String permgroup = Residence.getPermissionManager()
-				.getGroupNameByPlayer(player);
+		String permgroup = Residence.getPermissionManager().getGroupNameByPlayer(player);
 		boolean resadmin = Residence.isResAdminOn(player);
 		if (event.getAction() == Action.PHYSICAL) {
 			if (!resadmin) {
-				boolean hasuse = perms.playerHas(player.getName(), world,
-						"use", true);
-				boolean haspressure = perms.playerHas(player.getName(), world,
-						"pressure", hasuse);
+				boolean hasuse = perms.playerHas(player.getName(), world, "use", true);
+				boolean haspressure = perms.playerHas(player.getName(), world, "pressure", hasuse);
 				if ((!hasuse && !haspressure || !haspressure)
 						&& (mat == Material.STONE_PLATE || mat == Material.WOOD_PLATE)) {
 					event.setCancelled(true);
@@ -234,74 +412,58 @@ public class ResidencePlayerListener implements Listener {
 			}
 			return;
 		}
-		if (!resadmin
-				&& !Residence.getItemManager().isAllowed(heldItem, permgroup,
-						world)) {
-			player.sendMessage(ChatColor.RED
-					+ Residence.getLanguage().getPhrase("ItemBlacklisted"));
+		if (!resadmin && !Residence.getItemManager().isAllowed(heldItem, permgroup, world)) {
+			player.sendMessage(ChatColor.RED + Residence.getLanguage().getPhrase("ItemBlacklisted"));
 			event.setCancelled(true);
 			return;
 		}
 		if (event.getAction() == Action.LEFT_CLICK_BLOCK
 				|| event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-			if (player.getItemInHand().getTypeId() == Residence
-					.getConfigManager().getSelectionTooldID()) {
+			if (player.getItemInHand().getTypeId() == Residence.getConfigManager()
+					.getSelectionTooldID()) {
 				Plugin wep = Bukkit.getPluginManager().getPlugin("WorldEdit");
 				if (wep != null) {
 					if (((WorldEditPlugin) wep).getConfig().getInt("wand-item") == Residence
-							.getConfigManager().getSelectionTooldID()) {
+							.getConfigManager().getSelectionTooldID())
 						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")
 						|| group.canCreateResidences()
 						&& !player.isPermissionSet("residence.create")
-						&& !player.isPermissionSet("residence.select")
-						|| resadmin) {
+						&& !player.isPermissionSet("residence.select") || resadmin) {
 					if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
 						Location loc = block.getLocation();
 						Residence.getSelectionManager().placeLoc1(player, loc);
 						player.sendMessage(ChatColor.GREEN
-								+ Residence.getLanguage().getPhrase(
-										"SelectPoint",
-										Residence.getLanguage().getPhrase(
-												"Primary")) + ChatColor.RED
-								+ "(" + loc.getBlockX() + "," + loc.getBlockY()
-								+ "," + loc.getBlockZ() + ")" + ChatColor.GREEN
-								+ "!");
+								+ Residence.getLanguage().getPhrase("SelectPoint",
+										Residence.getLanguage().getPhrase("Primary"))
+								+ ChatColor.RED + "(" + loc.getBlockX() + "," + loc.getBlockY()
+												+ "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
 					} else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
 						Location loc = block.getLocation();
 						Residence.getSelectionManager().placeLoc2(player, loc);
 						player.sendMessage(ChatColor.GREEN
-								+ Residence.getLanguage().getPhrase(
-										"SelectPoint",
-										Residence.getLanguage().getPhrase(
-												"Secondary")) + ChatColor.RED
-								+ "(" + loc.getBlockX() + "," + loc.getBlockY()
-								+ "," + loc.getBlockZ() + ")" + ChatColor.GREEN
-								+ "!");
+								+ Residence.getLanguage().getPhrase("SelectPoint",
+										Residence.getLanguage().getPhrase("Secondary"))
+								+ ChatColor.RED + "(" + loc.getBlockX() + "," + loc.getBlockY()
+												+ "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
 					}
 				}
 			}
-			if (player.getItemInHand().getTypeId() == Residence
-					.getConfigManager().getInfoToolID()) {
+			if (player.getItemInHand().getTypeId() == Residence.getConfigManager().getInfoToolID()) {
 				if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
 					Location loc = block.getLocation();
-					String res = Residence.getResidenceManager().getNameByLoc(
-							loc);
+					String res = Residence.getResidenceManager().getNameByLoc(loc);
 					if (res != null) {
-						Residence.getResidenceManager().printAreaInfo(res,
-								player);
+						Residence.getResidenceManager().printAreaInfo(res, player);
 						event.setCancelled(true);
 					}
 					if (res == null) {
 						event.setCancelled(true);
-						player.sendMessage(Residence.getLanguage().getPhrase(
-								"NoResHere"));
+						player.sendMessage(Residence.getLanguage().getPhrase("NoResHere"));
 					}
 				}
 			}
@@ -311,32 +473,25 @@ public class ResidencePlayerListener implements Listener {
 						if (player.getItemInHand().getTypeId() == 351) {
 							if (player.getItemInHand().getData().getData() == 15
 									&& block.getType() == Material.GRASS
-									|| player.getItemInHand().getData()
-											.getData() == 3
+									|| player.getItemInHand().getData().getData() == 3
 									&& block.getTypeId() == 17
-									&& (block.getData() == 3
-											|| block.getData() == 7
-											|| block.getData() == 11 || block
-											.getData() == 15)) {
-								perms = Residence.getPermsByLocForPlayer(block
-										.getRelative(event.getBlockFace())
-										.getLocation(), player);
-								if (!perms.playerHas(player.getName(), world,
-										"build", true)) {
+									&& (block.getData() == 3 || block.getData() == 7
+									|| block.getData() == 11 || block.getData() == 15)) {
+								perms = Residence.getPermsByLocForPlayer(
+										block.getRelative(event.getBlockFace()).getLocation(),
+										player);
+								if (!perms.playerHas(player.getName(), world, "build", true)) {
 									event.setCancelled(true);
 									return;
 								}
 							}
 						}
 						if (heldItem == Material.ARMOR_STAND) {
-							perms = Residence.getPermsByLocForPlayer(block
-									.getRelative(event.getBlockFace())
-									.getLocation(), player);
-							if (!perms.playerHas(player.getName(), world,
-									"build", true)) {
+							perms = Residence.getPermsByLocForPlayer(
+									block.getRelative(event.getBlockFace()).getLocation(), player);
+							if (!perms.playerHas(player.getName(), world, "build", true)) {
 								player.sendMessage(ChatColor.RED
-										+ Residence.getLanguage().getPhrase(
-												"NoPermission"));
+										+ Residence.getLanguage().getPhrase("NoPermission"));
 								event.setCancelled(true);
 								return;
 							}
@@ -344,29 +499,22 @@ public class ResidencePlayerListener implements Listener {
 					}
 				}
 				if (isContainer(mat, block) || isCanUseEntity(mat, block)) {
-					boolean hasuse = perms.playerHas(player.getName(), world,
-							"use", true);
+					boolean hasuse = perms.playerHas(player.getName(), world, "use", true);
 					for (Entry<Material, String> checkMat : FlagPermissions
 							.getMaterialUseFlagList().entrySet()) {
 						if (mat == checkMat.getKey()) {
-							if (!perms.playerHas(player.getName(), world,
-									checkMat.getValue(), hasuse)) {
-								if (hasuse
-										|| checkMat.getValue().equals(
-												"container")) {
+							if (!perms.playerHas(player.getName(), world, checkMat.getValue(),
+									hasuse)) {
+								if (hasuse || checkMat.getValue().equals("container")) {
 									event.setCancelled(true);
 									player.sendMessage(ChatColor.RED
-											+ Residence
-													.getLanguage()
-													.getPhrase("FlagDeny",
-															checkMat.getValue()));
+											+ Residence.getLanguage().getPhrase("FlagDeny",
+													checkMat.getValue()));
 									return;
 								} else {
 									event.setCancelled(true);
 									player.sendMessage(ChatColor.RED
-											+ Residence.getLanguage()
-													.getPhrase("FlagDeny",
-															"use"));
+											+ Residence.getLanguage().getPhrase("FlagDeny", "use"));
 									return;
 								}
 							}
@@ -374,12 +522,10 @@ public class ResidencePlayerListener implements Listener {
 					}
 					if (Residence.getConfigManager().getCustomContainers()
 							.contains(Integer.valueOf(block.getTypeId()))) {
-						if (!perms.playerHas(player.getName(), world,
-								"container", hasuse)) {
+						if (!perms.playerHas(player.getName(), world, "container", hasuse)) {
 							event.setCancelled(true);
 							player.sendMessage(ChatColor.RED
-									+ Residence.getLanguage().getPhrase(
-											"FlagDeny", "container"));
+									+ Residence.getLanguage().getPhrase("FlagDeny", "container"));
 							return;
 						}
 					}
@@ -388,8 +534,7 @@ public class ResidencePlayerListener implements Listener {
 						if (!hasuse) {
 							event.setCancelled(true);
 							player.sendMessage(ChatColor.RED
-									+ Residence.getLanguage().getPhrase(
-											"FlagDeny", "use"));
+									+ Residence.getLanguage().getPhrase("FlagDeny", "use"));
 							return;
 						}
 					}
@@ -399,8 +544,7 @@ public class ResidencePlayerListener implements Listener {
 							if (!hasuse) {
 								event.setCancelled(true);
 								player.sendMessage(ChatColor.RED
-										+ Residence.getLanguage().getPhrase(
-												"FlagDeny", "use"));
+										+ Residence.getLanguage().getPhrase("FlagDeny", "use"));
 								return;
 							}
 						}
@@ -410,21 +554,39 @@ public class ResidencePlayerListener implements Listener {
 		}
 	}
 
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event) {
+		Player player = event.getPlayer();
+		if (Residence.isResAdminOn(player))
+			return;
+
+		Entity ent = event.getRightClicked();
+		if (ent.getType() != EntityType.ARMOR_STAND)
+			return;
+
+		FlagPermissions perms = Residence.getPermsByLocForPlayer(ent.getLocation(), player);
+		String world = player.getWorld().getName();
+
+		if (!perms.playerHas(player.getName(), world, "container",
+				perms.playerHas(player.getName(), world, "use", true))) {
+			event.setCancelled(true);
+			player.sendMessage(ChatColor.RED
+					+ Residence.getLanguage().getPhrase("FlagDeny", "container"));
+		}
+	}
+
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
 		Player player = event.getPlayer();
-		if (Residence.isResAdminOn(player)) {
+		if (Residence.isResAdminOn(player))
 			return;
-		}
 		Entity ent = event.getRightClicked();
 		/* Trade */
 		if (ent.getType() == EntityType.VILLAGER) {
 			ClaimedResidence res = Residence.getResidenceManager().getByLoc(
 					event.getPlayer().getLocation());
 
-			if (res != null
-					&& !res.getPermissions().playerHas(player.getName(),
-							"trade", true)) {
+			if (res != null && !res.getPermissions().playerHas(player.getName(), "trade", true)) {
 				player.sendMessage(ChatColor.RED
 						+ Residence.getLanguage().getPhrase("NoPermission"));
 				event.setCancelled(true);
@@ -433,21 +595,16 @@ public class ResidencePlayerListener implements Listener {
 
 		/* Container - ItemFrame protection */
 		Material heldItem = player.getItemInHand().getType();
-		if (!(ent instanceof Hanging)) {
+		if (!(ent instanceof Hanging))
 			return;
-		}
 		Hanging hanging = (Hanging) ent;
-		if (hanging.getType() != EntityType.ITEM_FRAME) {
+		if (hanging.getType() != EntityType.ITEM_FRAME)
 			return;
-		}
-		FlagPermissions perms = Residence.getPermsByLocForPlayer(
-				ent.getLocation(), player);
+		FlagPermissions perms = Residence.getPermsByLocForPlayer(ent.getLocation(), player);
 		String world = player.getWorld().getName();
-		String permgroup = Residence.getPermissionManager()
-				.getGroupNameByPlayer(player);
+		String permgroup = Residence.getPermissionManager().getGroupNameByPlayer(player);
 		if (!Residence.getItemManager().isAllowed(heldItem, permgroup, world)) {
-			player.sendMessage(ChatColor.RED
-					+ Residence.getLanguage().getPhrase("ItemBlacklisted"));
+			player.sendMessage(ChatColor.RED + Residence.getLanguage().getPhrase("ItemBlacklisted"));
 			event.setCancelled(true);
 			return;
 		}
@@ -455,99 +612,70 @@ public class ResidencePlayerListener implements Listener {
 				perms.playerHas(player.getName(), world, "use", true))) {
 			event.setCancelled(true);
 			player.sendMessage(ChatColor.RED
-					+ Residence.getLanguage()
-							.getPhrase("FlagDeny", "container"));
+					+ Residence.getLanguage().getPhrase("FlagDeny", "container"));
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onPlayerJoin(PlayerJoinEvent event) {
+		Player player = event.getPlayer();
+		lastUpdate.put(player.getName(), 0L);
+		if (Residence.getPermissionManager().isResidenceAdmin(player)) {
+			Residence.turnResAdminOn(player);
+		}
+		handleNewLocation(player, player.getLocation(), false);
+		if (player.isOp() || player.hasPermission("residence.versioncheck")) {
+			Residence.getVersionChecker().VersionCheck(player);
 		}
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event) {
+	public void onPlayerMove(PlayerMoveEvent event) {
 		Player player = event.getPlayer();
-		if (Residence.isResAdminOn(player)) {
+		if (player == null)
 			return;
-		}
-
-		Entity ent = event.getRightClicked();
-		if (ent.getType() != EntityType.ARMOR_STAND) {
+		long last = lastUpdate.get(player.getName());
+		long now = System.currentTimeMillis();
+		if (now - last < Residence.getConfigManager().getMinMoveUpdateInterval())
 			return;
+		lastUpdate.put(player.getName(), now);
+		if (event.getFrom().getWorld() == event.getTo().getWorld()) {
+			if (event.getFrom().distance(event.getTo()) == 0)
+				return;
 		}
+		handleNewLocation(player, event.getTo(), true);
+	}
 
-		FlagPermissions perms = Residence.getPermsByLocForPlayer(
-				ent.getLocation(), player);
-		String world = player.getWorld().getName();
-
-		if (!perms.playerHas(player.getName(), world, "container",
-				perms.playerHas(player.getName(), world, "use", true))) {
-			event.setCancelled(true);
-			player.sendMessage(ChatColor.RED
-					+ Residence.getLanguage()
-							.getPhrase("FlagDeny", "container"));
-		}
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerQuit(PlayerQuitEvent event) {
+		String pname = event.getPlayer().getName();
+		currentRes.remove(pname);
+		lastUpdate.remove(pname);
+		lastOutsideLoc.remove(pname);
+		Residence.getChatManager().removeFromChannel(pname);
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
+	public void onPlayerSpawn(PlayerRespawnEvent event) {
+		Location loc = event.getRespawnLocation();
+		Boolean bed = event.isBedSpawn();
 		Player player = event.getPlayer();
-		if (Residence.isResAdminOn(player)) {
+		ClaimedResidence res = Residence.getResidenceManager().getByLoc(loc);
+		if (res == null)
 			return;
+		if (res.getPermissions().playerHas(player.getName(), "move", true))
+			return;
+		if (bed) {
+			loc = player.getWorld().getSpawnLocation();
 		}
-		String pname = player.getName();
-		ClaimedResidence res = Residence.getResidenceManager().getByLoc(
-				event.getBlockClicked().getLocation());
+		res = Residence.getResidenceManager().getByLoc(loc);
 		if (res != null) {
-			if (Residence.getConfigManager().preventRentModify()
-					&& Residence.getConfigManager().enabledRentSystem()) {
-				if (Residence.getRentManager().isRented(res.getName())) {
-					player.sendMessage(ChatColor.RED
-							+ Residence.getLanguage().getPhrase(
-									"RentedModifyDeny"));
-					event.setCancelled(true);
-					return;
-				}
+			if (!res.getPermissions().playerHas(player.getName(), "move", true)) {
+				loc = res.getOutsideFreeLoc(loc);
 			}
 		}
-		FlagPermissions perms = Residence.getPermsByLocForPlayer(event
-				.getBlockClicked().getLocation(), player);
-		if (!perms.playerHas(pname, player.getWorld().getName(), "bucket",
-				perms.playerHas(pname, player.getWorld().getName(), "build",
-						true))) {
-			player.sendMessage(ChatColor.RED
-					+ Residence.getLanguage().getPhrase("FlagDeny", "bucket"));
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onPlayerBucketFill(PlayerBucketFillEvent event) {
-		Player player = event.getPlayer();
-		String pname = player.getName();
-		if (Residence.isResAdminOn(player)) {
-			return;
-		}
-		ClaimedResidence res = Residence.getResidenceManager().getByLoc(
-				event.getBlockClicked().getLocation());
-		if (res != null) {
-			if (Residence.getConfigManager().preventRentModify()
-					&& Residence.getConfigManager().enabledRentSystem()) {
-				if (Residence.getRentManager().isRented(res.getName())) {
-					player.sendMessage(ChatColor.RED
-							+ Residence.getLanguage().getPhrase(
-									"RentedModifyDeny"));
-					event.setCancelled(true);
-					return;
-				}
-			}
-		}
-		FlagPermissions perms = Residence.getPermsByLocForPlayer(event
-				.getBlockClicked().getLocation(), player);
-		boolean hasbucket = perms.playerHas(pname, player.getWorld().getName(),
-				"bucket", perms.playerHas(pname, player.getWorld().getName(),
-						"build", true));
-		if (!hasbucket) {
-			player.sendMessage(ChatColor.RED
-					+ Residence.getLanguage().getPhrase("FlagDeny", "bucket"));
-			event.setCancelled(true);
-		}
+		player.sendMessage(ChatColor.RED + Residence.getLanguage().getPhrase("NoSpawn"));
+		event.setRespawnLocation(loc);
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
@@ -565,29 +693,23 @@ public class ResidencePlayerListener implements Listener {
 				|| event.getCause() == TeleportCause.COMMAND
 				|| event.getCause() == TeleportCause.NETHER_PORTAL) {
 			if (res != null) {
-				String areaname = Residence.getResidenceManager().getNameByLoc(
-						loc);
-				if (!res.getPermissions().playerHas(player.getName(), "move",
-						true)) {
+				String areaname = Residence.getResidenceManager().getNameByLoc(loc);
+				if (!res.getPermissions().playerHas(player.getName(), "move", true)) {
 					event.setCancelled(true);
 					player.sendMessage(ChatColor.RED
-							+ Residence.getLanguage().getPhrase(
-									"ResidenceMoveDeny", areaname));
+							+ Residence.getLanguage().getPhrase("ResidenceMoveDeny", areaname));
 					return;
 				}
 			}
 		}
 		if (event.getCause() == TeleportCause.PLUGIN) {
 			if (res != null) {
-				String areaname = Residence.getResidenceManager().getNameByLoc(
-						loc);
-				if (!res.getPermissions().playerHas(player.getName(), "tp",
-						true)
+				String areaname = Residence.getResidenceManager().getNameByLoc(loc);
+				if (!res.getPermissions().playerHas(player.getName(), "tp", true)
 						&& !player.hasPermission("residence.admin.tp")) {
 					event.setCancelled(true);
 					player.sendMessage(ChatColor.RED
-							+ Residence.getLanguage().getPhrase("TeleportDeny",
-									areaname));
+							+ Residence.getLanguage().getPhrase("TeleportDeny", areaname));
 					return;
 				}
 			}
@@ -595,234 +717,15 @@ public class ResidencePlayerListener implements Listener {
 		handleNewLocation(player, loc, false);
 	}
 
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onPlayerMove(PlayerMoveEvent event) {
-		Player player = event.getPlayer();
-		if (player == null) {
-			return;
-		}
-		long last = lastUpdate.get(player.getName());
-		long now = System.currentTimeMillis();
-		if (now - last < Residence.getConfigManager()
-				.getMinMoveUpdateInterval()) {
-			return;
-		}
-		lastUpdate.put(player.getName(), now);
-		if (event.getFrom().getWorld() == event.getTo().getWorld()) {
-			if (event.getFrom().distance(event.getTo()) == 0) {
-				return;
-			}
-		}
-		handleNewLocation(player, event.getTo(), true);
-	}
-
-	public void handleNewLocation(Player player, Location loc, boolean move) {
-		String pname = player.getName();
-
-		ClaimedResidence res = Residence.getResidenceManager().getByLoc(loc);
-		String areaname = null;
-		boolean chatchange = false;
-		String subzone = null;
-		if (res != null) {
-			areaname = Residence.getResidenceManager().getNameByLoc(loc);
-			while (res.getSubzoneByLoc(player.getLocation()) != null) {
-				subzone = res.getSubzoneNameByLoc(player.getLocation());
-				res = res.getSubzoneByLoc(player.getLocation());
-				areaname = areaname + "." + subzone;
-			}
-		}
-		ClaimedResidence ResOld = null;
-		if (currentRes.containsKey(pname)) {
-			ResOld = Residence.getResidenceManager().getByName(
-					currentRes.get(pname));
-			if (ResOld == null) {
-				currentRes.remove(pname);
-			}
-		}
-		if (res == null) {
-			lastOutsideLoc.put(pname, loc);
-			if (ResOld != null) {
-				String leave = ResOld.getLeaveMessage();
-				/*
-				 * TODO - ResidenceLeaveEvent is deprecated as of 21-MAY-2013.
-				 * Its functionality is replaced by ResidenceChangedEvent. For
-				 * now, this event is still supported until it is removed at a
-				 * suitable time in the future.
-				 */
-				ResidenceLeaveEvent leaveevent = new ResidenceLeaveEvent(
-						ResOld, player);
-				Residence.getServ().getPluginManager().callEvent(leaveevent);
-
-				// New ResidenceChangeEvent
-				ResidenceChangedEvent chgEvent = new ResidenceChangedEvent(
-						ResOld, null, player);
-				Residence.getServ().getPluginManager().callEvent(chgEvent);
-
-				if (leave != null && !leave.equals("")) {
-					if (Residence.getConfigManager().useActionBar()) {
-						ActionBar
-								.send(player,
-										(new StringBuilder())
-												.append(ChatColor.YELLOW)
-												.append(insertMessages(player,
-														ResOld.getName(),
-														ResOld, leave))
-												.toString());
-					} else {
-						player.sendMessage(ChatColor.YELLOW
-								+ this.insertMessages(player, ResOld.getName(),
-										ResOld, leave));
-					}
-				}
-				currentRes.remove(pname);
-				Residence.getChatManager().removeFromChannel(pname);
-			}
-			return;
-		}
-		if (move) {
-			if (!res.getPermissions().playerHas(pname, "move", true)
-					&& !Residence.isResAdminOn(player)
-					&& !player.hasPermission("residence.admin.move")) {
-				Location lastLoc = lastOutsideLoc.get(pname);
-				if (lastLoc != null) {
-					player.teleport(lastLoc);
-				} else {
-					player.teleport(res.getOutsideFreeLoc(loc));
-				}
-				player.sendMessage(ChatColor.RED
-						+ Residence.getLanguage().getPhrase(
-								"ResidenceMoveDeny",
-								res.getName().split("\\.")[res.getName().split(
-										"\\.").length - 1]));
-				return;
-			}
-		}
-		lastOutsideLoc.put(pname, loc);
-		if (!currentRes.containsKey(pname) || ResOld != res) {
-			currentRes.put(pname, areaname);
-			if (subzone == null) {
-				chatchange = true;
-			}
-
-			// "from" residence for ResidenceChangedEvent
-			ClaimedResidence chgFrom = null;
-			if (ResOld != res && ResOld != null) {
-				String leave = ResOld.getLeaveMessage();
-				chgFrom = ResOld;
-
-				/*
-				 * TODO - ResidenceLeaveEvent is deprecated as of 21-MAY-2013.
-				 * Its functionality is replaced by ResidenceChangedEvent. For
-				 * now, this event is still supported until it is removed at a
-				 * suitable time in the future.
-				 */
-				ResidenceLeaveEvent leaveevent = new ResidenceLeaveEvent(
-						ResOld, player);
-				Residence.getServ().getPluginManager().callEvent(leaveevent);
-
-				if (leave != null && !leave.equals("")
-						&& ResOld != res.getParent()) {
-					if (Residence.getConfigManager().useActionBar()) {
-						ActionBar
-								.send(player,
-										(new StringBuilder())
-												.append(ChatColor.YELLOW)
-												.append(insertMessages(player,
-														ResOld.getName(),
-														ResOld, leave))
-												.toString());
-					} else {
-						player.sendMessage(ChatColor.YELLOW
-								+ this.insertMessages(player, ResOld.getName(),
-										ResOld, leave));
-					}
-				}
-			}
-			String enterMessage = res.getEnterMessage();
-
-			/*
-			 * TODO - ResidenceEnterEvent is deprecated as of 21-MAY-2013. Its
-			 * functionality is replaced by ResidenceChangedEvent. For now, this
-			 * event is still supported until it is removed at a suitable time
-			 * in the future.
-			 */
-			ResidenceEnterEvent enterevent = new ResidenceEnterEvent(res,
-					player);
-			Residence.getServ().getPluginManager().callEvent(enterevent);
-
-			// New ResidenceChangedEvent
-			ResidenceChangedEvent chgEvent = new ResidenceChangedEvent(chgFrom,
-					res, player);
-			Residence.getServ().getPluginManager().callEvent(chgEvent);
-
-			if (enterMessage != null && !enterMessage.equals("")
-					&& !(ResOld != null && res == ResOld.getParent())) {
-				if (Residence.getConfigManager().useActionBar()) {
-					ActionBar.send(
-							player,
-							(new StringBuilder())
-									.append(ChatColor.YELLOW)
-									.append(insertMessages(player, areaname,
-											res, enterMessage)).toString());
-				} else {
-					player.sendMessage(ChatColor.YELLOW
-							+ this.insertMessages(player, areaname, res,
-									enterMessage));
-				}
-			}
-		}
-		if (chatchange && chatenabled) {
-			Residence.getChatManager().setChannel(pname, areaname);
-		}
-	}
-
-	public String insertMessages(Player player, String areaname,
-			ClaimedResidence res, String message) {
-		try {
-			message = message.replaceAll("%player", player.getName());
-			message = message.replaceAll("%owner", res.getPermissions()
-					.getOwner());
-			message = message.replaceAll("%residence", areaname);
-		} catch (Exception ex) {
-			return "";
-		}
-		return message;
-	}
-
-	public void doHeals() {
-		try {
-			for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-				String resname = Residence.getPlayerListener()
-						.getCurrentResidenceName(player.getName());
-				ClaimedResidence res = null;
-				if (resname != null) {
-					res = Residence.getResidenceManager().getByName(resname);
-				}
-				if (res != null && res.getPermissions().has("healing", false)) {
-					Damageable damage = player;
-					double health = damage.getHealth();
-					if (health < 20 && !player.isDead()) {
-						player.setHealth(health + 1);
-					}
-				}
-			}
-		} catch (Exception ex) {
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onPlayerChat(AsyncPlayerChatEvent event) {
-		String pname = event.getPlayer().getName();
-		if (chatenabled && playerToggleChat.contains(pname)) {
-			String area = currentRes.get(pname);
-			if (area != null) {
-				ChatChannel channel = Residence.getChatManager().getChannel(
-						area);
-				if (channel != null) {
-					channel.chat(pname, event.getMessage());
-				}
-				event.setCancelled(true);
-			}
+	public void reload() {
+		currentRes = new HashMap<String, String>();
+		lastUpdate = new HashMap<String, Long>();
+		lastOutsideLoc = new HashMap<String, Location>();
+		playerToggleChat = new ArrayList<String>();
+		minUpdateTime = Residence.getConfigManager().getMinMoveUpdateInterval();
+		chatenabled = Residence.getConfigManager().chatEnabled();
+		for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+			lastUpdate.put(player.getName(), System.currentTimeMillis());
 		}
 	}
 
@@ -840,8 +743,4 @@ public class ResidencePlayerListener implements Listener {
 							ChatColor.RED + "ON" + ChatColor.YELLOW + "!"));
 		}
 	}
-
-	public String getCurrentResidenceName(String player) {
-		return currentRes.get(player);
-	}
 }