/[projects]/miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/chests/AdvancedChest.java
ViewVC logotype

Diff of /miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/chests/AdvancedChest.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1870 by torben, Wed Nov 7 08:29:16 2012 UTC revision 1904 by torben, Tue Dec 18 10:33:47 2012 UTC
# Line 137  public class AdvancedChest  implements L Line 137  public class AdvancedChest  implements L
137                                  addChest(loc, chest);                                  addChest(loc, chest);
138                                  player.sendMessage("Chest is now " + modeStr);                                  player.sendMessage("Chest is now " + modeStr);
139                          } else {                          } else {
140                                    server.getLogger().info( player.getName() + " tried to protect a chest owned by " + chest.getOwner() );
141                                  player.sendMessage("This chest is already protected");                                  player.sendMessage("This chest is already protected");
142                          }                          }
143                          return true;                          return true;
# Line 149  public class AdvancedChest  implements L Line 150  public class AdvancedChest  implements L
150                          }                          }
151                          if (! chest.getOwner().equals( player.getName() ) ) {                          if (! chest.getOwner().equals( player.getName() ) ) {
152                                  player.sendMessage("You can not remove lock from a chest you don't own");                                  player.sendMessage("You can not remove lock from a chest you don't own");
153                                    server.getLogger().info( player.getName() + " tried to remove protection froma chest owned by " + chest.getOwner() );
154                                  return true;                                  return true;
155                          }                          }
156    
# Line 165  public class AdvancedChest  implements L Line 167  public class AdvancedChest  implements L
167                          }                          }
168                          if (! chest.getOwner().equals( player.getName() ) ) {                          if (! chest.getOwner().equals( player.getName() ) ) {
169                                  player.sendMessage("You can not set new owner of a chest you dont own");                                  player.sendMessage("You can not set new owner of a chest you dont own");
170                                    server.getLogger().info( player.getName() + " tried to set owner on a chest owned by " + chest.getOwner() );
171                                  return true;                                  return true;
172                          }                          }
173                          if (args.length != 2) {                          if (args.length != 2) {
# Line 189  public class AdvancedChest  implements L Line 192  public class AdvancedChest  implements L
192                          }                          }
193                          if (! chest.getOwner().equals( player.getName() ) ) {                          if (! chest.getOwner().equals( player.getName() ) ) {
194                                  player.sendMessage("You can not add/remove players from a chest you don't own");                                  player.sendMessage("You can not add/remove players from a chest you don't own");
195                                    server.getLogger().info( player.getName() + " tried to add/remove player on a chest owned by " + chest.getOwner() );
196                                  return true;                                  return true;
197                          }                          }
198                          if (args.length != 2) {                          if (args.length != 2) {
# Line 218  public class AdvancedChest  implements L Line 222  public class AdvancedChest  implements L
222                                  player.sendMessage("This chest is not protected");                                  player.sendMessage("This chest is not protected");
223                                  return true;                                  return true;
224                          }                          }
225                          if (! chest.getOwner().equals( player.getName() ) ) {                          if (! chest.getOwner().equals( player.getName() ) ) {                          
226                                  player.sendMessage("You can not comment a chest you don't own");                                  player.sendMessage("You can not comment a chest you don't own");
227                                    server.getLogger().info( player.getName() + " tried to comment on a chest owned by " + chest.getOwner() );
228                                  return true;                                  return true;
229                          }                          }
230    
# Line 275  public class AdvancedChest  implements L Line 280  public class AdvancedChest  implements L
280                          } else {                          } else {
281                                  event.setCancelled(true);                                  event.setCancelled(true);
282                                  event.getPlayer().sendMessage("You can't destroy that chest");                                  event.getPlayer().sendMessage("You can't destroy that chest");
283                                  server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " tried breaking a chest owned by " + chest.getOwner() + "(Comment: " + chest.getComment() + ")");                                  server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " tried breaking a chest owned by " + chest.getOwner() + chest.getCommentString() );
284                          }                          }
285                  }                  }
286          }          }
# Line 425  public class AdvancedChest  implements L Line 430  public class AdvancedChest  implements L
430                  for (Block b : event.blockList() ) {                  for (Block b : event.blockList() ) {
431                          ChestBean chest = chestMap.get( b.getLocation() );                          ChestBean chest = chestMap.get( b.getLocation() );
432                          if (chest != null) {                          if (chest != null) {
433                                  server.getLogger().info( "[AdvancedChest] Prevented an explosion from destroying chest owned by " + chest.getOwner() + "(Comment: " + chest.getComment() + ")" );                                  server.getLogger().info( "[AdvancedChest] Prevented an explosion from destroying chest owned by " + chest.getOwner() +  chest.getCommentString() );
434                                  event.setCancelled( true );                                  event.setCancelled( true );
435                                  return;                                  return;
436                          }                          }
# Line 436  public class AdvancedChest  implements L Line 441  public class AdvancedChest  implements L
441          public void onChestBurn(BlockBurnEvent event) {          public void onChestBurn(BlockBurnEvent event) {
442                  ChestBean chest = chestMap.get( event.getBlock().getLocation() );                  ChestBean chest = chestMap.get( event.getBlock().getLocation() );
443                  if (chest != null) {                  if (chest != null) {
444                          server.getLogger().info( "[AdvancedChest] prevented a fire from destrying chest owned by " + chest.getOwner() + "(Comment: " + chest.getComment() + ")" );                          server.getLogger().info( "[AdvancedChest] prevented a fire from destrying chest owned by " + chest.getOwner() + chest.getCommentString()  );
445                          event.setCancelled( true);                          event.setCancelled( true);
446                  }                  }
447          }          }
# Line 465  public class AdvancedChest  implements L Line 470  public class AdvancedChest  implements L
470                                          return; //chest is opened by it's owner                                          return; //chest is opened by it's owner
471                                  }                                  }
472                                                                    
473                                  Set<String> players = Util.stringToSet( chest.getModifyPlayers() );                                  Set<String> players = chest.getModifyPlayersSet() ;
474                                  if ( players.contains(player.getName()) ) {                                  if ( players.contains(player.getName()) ) {
475                                          return; //this player is on the whitelist so he may open                                          return; //this player is on the whitelist so he may open
476                                  }                                  }
477    
478    
479                                  server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " tried opening a chest owned by " + chest.getOwner()  + "(Comment: " + chest.getComment() + ")");                                  server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " tried opening a chest owned by " + chest.getOwner()  + chest.getCommentString() );
480                                  player.sendMessage( ChatColor.BLUE +  "Sorry but this chest is locked !");                                  player.sendMessage( ChatColor.BLUE +  "Sorry but this chest is locked !");
481                                  event.setCancelled(true);                                  event.setCancelled(true);
482                          }                          }
# Line 506  public class AdvancedChest  implements L Line 511  public class AdvancedChest  implements L
511                                  return; //chest is owned by it's own player                                  return; //chest is owned by it's own player
512                          }                          }
513                                                    
514                          Set<String> players = Util.stringToSet( chest.getModifyPlayers() );                          Set<String> players = chest.getModifyPlayersSet();
515                          if ( players.contains(player.getName()) ) {                          if ( players.contains(player.getName()) ) {
516                                  return; //this player is on the whitelist so he may open                                  return; //this player is on the whitelist so he may open
517                          }                          }
518                                                    
519                                                    
520                          server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " opened a snitching chest owned by " + chest.getOwner()  + "(Comment: " + chest.getComment() + ")");                          server.getLogger().info( "[AdvancedChest] " + event.getPlayer().getName() + " opened a snitching chest owned by " + chest.getOwner()  + chest.getCommentString()  );
521    
522                          ItemCount contents = countItems( event.getInventory().getContents() );                                            ItemCount contents = countItems( event.getInventory().getContents() );                  
523                                                    
Legend:
Removed from v.1870  
changed lines
  Added in v.1904
  ViewVC Help
Powered by ViewVC 1.1.20