--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/chests/AdvancedChest.java	2012/06/03 18:05:09	1807
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/chests/AdvancedChest.java	2012/11/27 15:38:11	1874
@@ -24,6 +24,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
@@ -76,7 +77,7 @@
 		
 		if (args.length == 0) {
 			player.sendMessage("Usage:");
-			player.sendMessage("/chest (status|lock|snitch|remove|addplayer|removeplayer) [player]");
+			player.sendMessage("/chest (status|lock|snitch|remove|addplayer|removeplayer|setowner|comment) [player]");
 			return true;
 		}
 		
@@ -110,6 +111,7 @@
 				
 				player.sendMessage(ChatColor.GREEN + "Chest is  a " + mode + " chest owned by " + chest.getOwner());
 				player.sendMessage(ChatColor.GREEN + "Allowed players: " + chest.getModifyPlayers() );
+				player.sendMessage(ChatColor.GREEN + "Comment: " + chest.getComment() );
 			} else {
 				player.sendMessage(ChatColor.GREEN + "The chest is not protected");
 			}
@@ -131,21 +133,55 @@
 					modeStr = "snitching";
 				}
 				chest.setModifyPlayers("");
+				chest.setComment("");
 				addChest(loc, chest);
 				player.sendMessage("Chest is now " + modeStr);
 			} else {
+				server.getLogger().info( player.getName() + " tried to protect a chest owned by " + chest.getOwner() );
 				player.sendMessage("This chest is already protected");
 			}
 			return true;
 		}
 		
 		if (cmd.equals("remove")) {
-			if (chest != null) {
-				player.sendMessage("[LockedChest] Removing protection from chest");
-				removeChest(loc);				
-			} else {
-				player.sendMessage("This chest is not protected");	
+			if (chest == null) {
+				player.sendMessage("This chest is not protected");
+				return true;
+			}
+			if (! chest.getOwner().equals( player.getName() ) ) {
+				player.sendMessage("You can not remove lock from a chest you don't own");
+				server.getLogger().info( player.getName() + " tried to remove protection froma chest owned by " + chest.getOwner() );
+				return true;
 			}
+
+			player.sendMessage("[LockedChest] Removing protection from chest");
+			removeChest(loc);				
+
+			return true;
+		}
+
+		if (cmd.equals("setowner")) {
+			if (chest == null) {
+				player.sendMessage("This chest is not protected");
+				return true;
+			}
+			if (! chest.getOwner().equals( player.getName() ) ) {
+				player.sendMessage("You can not set new owner of a chest you dont own");
+				server.getLogger().info( player.getName() + " tried to set owner on a chest owned by " + chest.getOwner() );
+				return true;
+			}
+			if (args.length != 2) {
+				player.sendMessage("You need to specify which player should own this chest");
+				return true;
+			} 
+			OfflinePlayer p2 = server.getOfflinePlayer(args[1]);
+			if ( p2.hasPlayedBefore() == false && p2.isOnline() == false) {
+				player.sendMessage("Unknown user: " + args[1] );
+				return true;
+			}
+			chest.setOwner( p2.getName() );
+			plugin.getDatabase().save( chest );
+			player.sendMessage("ok");
 			return true;
 		}
 		
@@ -154,6 +190,11 @@
 				player.sendMessage("This chest is not protected");
 				return true;
 			}
+			if (! chest.getOwner().equals( player.getName() ) ) {
+				player.sendMessage("You can not add/remove players from a chest you don't own");
+				server.getLogger().info( player.getName() + " tried to add/remove player on a chest owned by " + chest.getOwner() );
+				return true;
+			}
 			if (args.length != 2) {
 				player.sendMessage("You need to specify which player to add or remove");
 				return true;
@@ -166,9 +207,9 @@
 			
 			Set<String> players = Util.stringToSet( chest.getModifyPlayers() );
 			if (cmd.equals("addplayer")) {
-				players.add(args[1]);
+				players.add(p2.getName());
 			} else {
-				players.remove(args[1]);
+				players.remove(p2.getName());
 			}
 			
 			chest.setModifyPlayers( Util.setToString(players) );
@@ -176,6 +217,29 @@
 			player.sendMessage("ok");
 			return true;
 		}
+		if (cmd.equals("comment")) {	
+			if (chest == null) {
+				player.sendMessage("This chest is not protected");
+				return true;
+			}
+			if (! chest.getOwner().equals( player.getName() ) ) {				
+				player.sendMessage("You can not comment a chest you don't own");
+				server.getLogger().info( player.getName() + " tried to comment on a chest owned by " + chest.getOwner() );
+				return true;
+			}
+
+			StringBuilder sb = new StringBuilder();
+			for (int i=1; i<args.length; i++) {
+				sb.append(args[i]).append(" ");
+			}
+			String comment = sb.toString().trim();
+
+			chest.setComment( comment );
+			plugin.getDatabase().save( chest );
+			player.sendMessage("Comment set");
+
+			return true;
+		}
 		
 		/*
 		if (chest != null) {
@@ -216,6 +280,7 @@
 			} else {
 				event.setCancelled(true);
 				event.getPlayer().sendMessage("You can't destroy that chest");
+				server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " tried breaking a chest owned by " + chest.getOwner() + chest.getCommentString() );
 			}
 		}
 	}
@@ -264,7 +329,7 @@
 	
 	void loadChests() {		
 		int count = loadChestsWorker();
-		plugin.getLogger().info("[AdvancedChest] loaded " + count + " chests");
+		server.getLogger().info("[AdvancedChest] loaded " + count + " chests");
 	}
 	
 	
@@ -365,11 +430,21 @@
 		for (Block b : event.blockList() ) {
 			ChestBean chest = chestMap.get( b.getLocation() );
 			if (chest != null) {
+				server.getLogger().info( "[AdvancedChest] Prevented an explosion from destroying chest owned by " + chest.getOwner() +  chest.getCommentString() );
 				event.setCancelled( true );
 				return;
 			}
 		}
-	}	
+	}
+
+	@EventHandler
+	public void onChestBurn(BlockBurnEvent event) {
+		ChestBean chest = chestMap.get( event.getBlock().getLocation() );
+		if (chest != null) {
+			server.getLogger().info( "[AdvancedChest] prevented a fire from destrying chest owned by " + chest.getOwner() + chest.getCommentString()  );
+			event.setCancelled( true);
+		}
+	}
 	
 	// prevent a user from opening a chest 
 	@EventHandler
@@ -395,16 +470,13 @@
 					return; //chest is opened by it's owner
 				}
 				
-				if (chest.getModifyPlayers() != null && chest.getModifyPlayers().length()>0) {
-					String modplayers[] = chest.getModifyPlayers().split(",");
-					for (String p : modplayers) {
-						if ( player.getName().equals(p) ) {
-							return; //this player is on the whitelist so he may open
-						}
-					}
+				Set<String> players = Util.stringToSet( chest.getModifyPlayers() );
+				if ( players.contains(player.getName()) ) {
+					return; //this player is on the whitelist so he may open
 				}
 
-			
+
+				server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " tried opening a chest owned by " + chest.getOwner()  + chest.getCommentString() );
 				player.sendMessage( ChatColor.BLUE +  "Sorry but this chest is locked !");
 				event.setCancelled(true);
 			}
@@ -437,9 +509,16 @@
 			Player player = (Player) event.getPlayer();
 			if (player.getName().equals(chest.getOwner() )) {
 				return; //chest is owned by it's own player
-			}			
+			}
+			
+			Set<String> players = Util.stringToSet( chest.getModifyPlayers() );
+			if ( players.contains(player.getName()) ) {
+				return; //this player is on the whitelist so he may open
+			}
 			
 			
+			server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " opened a snitching chest owned by " + chest.getOwner()  + chest.getCommentString()  );
+
 			ItemCount contents = countItems( event.getInventory().getContents() );			
 			
 			contentMap.put(player.getName(), contents );
@@ -509,7 +588,7 @@
 					}
 				
 				
-					plugin.getLogger().info(msg);
+					server.getLogger().info( "[AdvancedChest]" + msg);
 					plugin.getMessageWrapper().sendMessage("system", owner, msg);
 				}