--- miscJava/minecraft-plugins/hoeruputils/src/HoerupUtils.java	2010/11/20 08:42:06	1195
+++ miscJava/minecraft-plugins/hoeruputils/src/HoerupUtils.java	2010/11/20 08:59:03	1196
@@ -6,8 +6,6 @@
 
 	final static Logger log = Logger.getLogger("HoerupUtils");
 
-	//private boolean adminDestroy = false;
-	private Set<String> adminDestroyers = new HashSet<String>();
 
 	private void registerCommands() {
 		etc e = etc.getInstance();
@@ -38,7 +36,6 @@
 	public void initialize() {
 		PluginLoader loader = etc.getLoader();
 		loader.addListener( PluginLoader.Hook.COMMAND, new HoerupUtilsPlugin(), this, PluginListener.Priority.MEDIUM );
-		loader.addListener( PluginLoader.Hook.BLOCK_DESTROYED, new AdminDestroy(), this, PluginListener.Priority.MEDIUM );
 		loader.addListener( PluginLoader.Hook.LOGIN, new ConnectedUsers(), this, PluginListener.Priority.MEDIUM );
 
 		Jail j = new Jail();
@@ -46,12 +43,15 @@
 		loader.addListener( PluginLoader.Hook.COMMAND, j, this, PluginListener.Priority.MEDIUM );
 		loader.addListener( PluginLoader.Hook.PLAYER_MOVE, j, this, PluginListener.Priority.MEDIUM );
 
+		AdminDestroy adm = new AdminDestroy();
+		loader.addListener( PluginLoader.Hook.COMMAND, adm, this, PluginListener.Priority.MEDIUM);
+		loader.addListener( PluginLoader.Hook.BLOCK_DESTROYED, adm, this, PluginListener.Priority.MEDIUM );
+		loader.addListener( PluginLoader.Hook.DISCONNECT, adm, this, PluginListener.Priority.MEDIUM );
 
 
 		registerCommands();
 	}
 
-	final static int HAND_EMPTY = -1;
 
 
 	class ConnectedUsers extends PluginListener {
@@ -70,26 +70,6 @@
 		}
 	}
 
-	public class AdminDestroy  extends PluginListener {	
-		public boolean onBlockDestroy(Player player, Block block) {
-			if (player.isAdmin() && adminDestroyers.contains(player.getName() ) ) {
-				if (player.getItemInHand() == HAND_EMPTY) {
-
-					int oldType = block.getType();
-
-					block.setType(0);
-					etc.getServer().setBlock(block);
-
-					if (oldType > 4 && oldType != 13) {  //dont drop stone or dirt, gravel
-						etc.getServer().dropItem(block.getX(), block.getY(), block.getZ(), oldType); // diamond resource block  should drop diamonds and not a new diamond resource block
-					}
-
-					return true;
-				}
-			}
-			return false;
-		}
-	}
 
 	public static String getBearingStr(int angle) {
 		if (angle < 22) {
@@ -186,26 +166,10 @@
 			return  (srv.getBlockIdAt(x,y,z) == BLOCK_AIR && srv.getBlockIdAt(x,y+1,z) == BLOCK_AIR);
 		}
 
-		
-
-		public void adminDestroy(Player player, String[] split) {
-			String name = player.getName();
-			if (adminDestroyers.contains(name) ) {
-				adminDestroyers.remove(name);
-				player.sendMessage("Admindestroy disabled");
-			} else {
-				adminDestroyers.add(name);
-				player.sendMessage("Admindestroy enabled");
-			}
-		}
-
 
 		@Override
 		public boolean onCommand(Player player, java.lang.String[] split) {
-			if ( split[0].equals("/admindestroy") && player.canUseCommand("/admindestroy") ) {
-				adminDestroy(player,split);
-				return true;
-			} else if( split[0].equals("/setpos") && player.canUseCommand("/setpos") ) {
+			if( split[0].equals("/setpos") && player.canUseCommand("/setpos") ) {
 				setPos(player, split);
 				return true;
 			} else if ( split[0].equals("/whereis" ) && player.canUseCommand("/whereis")) {