--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/chests/AdvancedChest.java 2012/11/06 16:49:06 1869 +++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/chests/AdvancedChest.java 2012/12/18 10:33:47 1904 @@ -137,6 +137,7 @@ 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; @@ -149,6 +150,7 @@ } 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; } @@ -165,6 +167,7 @@ } 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) { @@ -189,6 +192,7 @@ } 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) { @@ -218,8 +222,9 @@ player.sendMessage("This chest is not protected"); return true; } - if (! chest.getOwner().equals( player.getName() ) ) { + 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; } @@ -275,7 +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() ); + server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " tried breaking a chest owned by " + chest.getOwner() + chest.getCommentString() ); } } } @@ -425,7 +430,7 @@ 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() ); + server.getLogger().info( "[AdvancedChest] Prevented an explosion from destroying chest owned by " + chest.getOwner() + chest.getCommentString() ); event.setCancelled( true ); return; } @@ -436,7 +441,7 @@ 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() ); + server.getLogger().info( "[AdvancedChest] prevented a fire from destrying chest owned by " + chest.getOwner() + chest.getCommentString() ); event.setCancelled( true); } } @@ -465,13 +470,13 @@ return; //chest is opened by it's owner } - Set players = Util.stringToSet( chest.getModifyPlayers() ); + Set players = chest.getModifyPlayersSet() ; 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() ); + 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); } @@ -506,13 +511,13 @@ return; //chest is owned by it's own player } - Set players = Util.stringToSet( chest.getModifyPlayers() ); + Set players = chest.getModifyPlayersSet(); 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() ); + server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " opened a snitching chest owned by " + chest.getOwner() + chest.getCommentString() ); ItemCount contents = countItems( event.getInventory().getContents() );