Addition of optional range parameter to delete command.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java

@@ -20,16 +20,16 @@ import org.l2jmobius.gameserver.data.sql.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -41,44 +41,66 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			final WorldObject obj = activeChar.getTarget();
+			final String[] split = command.split(" ");
-			if (obj instanceof NpcInstance)
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
+		}
+		return true;
+	}
+	
+	private void handleDelete(PlayerInstance activeChar, int range)
+	{
+		if (range > 0)
+		{
+			for (WorldObject target : World.getInstance().getVisibleObjects(activeChar, range))
 			{
-				final NpcInstance target = (NpcInstance) obj;
+				if (!target.isNpc())
-				target.deleteMe();
-				
-				final Spawn spawn = target.getSpawn();
-				if (spawn != null)
 				{
-					if (GrandBossManager.getInstance().isDefined(spawn.getNpcId()))
+					continue;
-					{
-						BuilderUtil.sendSysMessage(activeChar, "You cannot delete a grandboss.");
-						return true;
-					}
-					
-					spawn.stopRespawn();
-					
-					if (RaidBossSpawnManager.getInstance().isDefined(spawn.getNpcId()))
-					{
-						RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
-					}
-					else
-					{
-						SpawnTable.getInstance().deleteSpawn(spawn, true);
-					}
 				}
+				deleteNpc(activeChar, (NpcInstance) target);
+			}
+			return;
+		}
 		
-				BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+		final WorldObject obj = activeChar.getTarget();
+		if (obj instanceof NpcInstance)
+		{
+			deleteNpc(activeChar, (NpcInstance) obj);
+		}
+		else
+		{
+			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
+		}
+	}
+	
+	private void deleteNpc(PlayerInstance activeChar, NpcInstance target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			if (GrandBossManager.getInstance().isDefined(spawn.getNpcId()))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "You cannot delete a grandboss.");
+				return;
+			}
+			
+			spawn.stopRespawn();
+			
+			if (RaidBossSpawnManager.getInstance().isDefined(spawn.getNpcId()))
+			{
+				RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
 			}
 			else
 			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
 			}
 		}
 		
-		return true;
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 	}
 	
 	@Override

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java

@@ -20,16 +20,16 @@ import org.l2jmobius.gameserver.data.sql.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.spawn.Spawn;
-import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -41,44 +41,66 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			final WorldObject obj = activeChar.getTarget();
+			final String[] split = command.split(" ");
-			if (obj instanceof NpcInstance)
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
+		}
+		return true;
+	}
+	
+	private void handleDelete(PlayerInstance activeChar, int range)
+	{
+		if (range > 0)
+		{
+			for (WorldObject target : World.getInstance().getVisibleObjects(activeChar, range))
 			{
-				final NpcInstance target = (NpcInstance) obj;
+				if (!target.isNpc())
-				target.deleteMe();
-				
-				final Spawn spawn = target.getSpawn();
-				if (spawn != null)
 				{
-					if (GrandBossManager.getInstance().isDefined(spawn.getNpcId()))
+					continue;
-					{
-						BuilderUtil.sendSysMessage(activeChar, "You cannot delete a grandboss.");
-						return true;
-					}
-					
-					spawn.stopRespawn();
-					
-					if (RaidBossSpawnManager.getInstance().isDefined(spawn.getNpcId()))
-					{
-						RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
-					}
-					else
-					{
-						SpawnTable.getInstance().deleteSpawn(spawn, true);
-					}
 				}
+				deleteNpc(activeChar, (NpcInstance) target);
+			}
+			return;
+		}
 		
-				BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+		final WorldObject obj = activeChar.getTarget();
+		if (obj instanceof NpcInstance)
+		{
+			deleteNpc(activeChar, (NpcInstance) obj);
+		}
+		else
+		{
+			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
+		}
+	}
+	
+	private void deleteNpc(PlayerInstance activeChar, NpcInstance target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			if (GrandBossManager.getInstance().isDefined(spawn.getNpcId()))
+			{
+				BuilderUtil.sendSysMessage(activeChar, "You cannot delete a grandboss.");
+				return;
+			}
+			
+			spawn.stopRespawn();
+			
+			if (RaidBossSpawnManager.getInstance().isDefined(spawn.getNpcId()))
+			{
+				RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
 			}
 			else
 			{
-				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
 			}
 		}
 		
-		return true;
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 	}
 	
 	@Override

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (RaidBossSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (RaidBossSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (RaidBossSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (RaidBossSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDelete.java

@@ -20,14 +20,15 @@ import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
 import org.l2jmobius.gameserver.model.Spawn;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 /**
  * This class handles following admin commands: - delete = deletes target
- * @version $Revision: 1.2.2.1.2.4 $ $Date: 2005/04/11 10:05:56 $
  */
 public class AdminDelete implements IAdminCommandHandler
 {
@@ -39,9 +40,10 @@ public class AdminDelete implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, PlayerInstance activeChar)
 	{
-		if (command.equals("admin_delete"))
+		if (command.startsWith("admin_delete"))
 		{
-			handleDelete(activeChar);
+			final String[] split = command.split(" ");
+			handleDelete(activeChar, (split.length > 1) && Util.isDigit(split[1]) ? Integer.parseInt(split[1]) : 0);
 		}
 		return true;
 	}
@@ -52,35 +54,47 @@ public class AdminDelete implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	// TODO: add possibility to delete any WorldObject (except PlayerInstance)
+	private void handleDelete(PlayerInstance activeChar, int range)
-	private void handleDelete(PlayerInstance activeChar)
 	{
+		if (range > 0)
+		{
+			World.getInstance().forEachVisibleObjectInRange(activeChar, Npc.class, range, target ->
+			{
+				deleteNpc(activeChar, target);
+			});
+			return;
+		}
+		
 		final WorldObject obj = activeChar.getTarget();
 		if (obj instanceof Npc)
 		{
-			final Npc target = (Npc) obj;
+			deleteNpc(activeChar, (Npc) obj);
-			target.deleteMe();
-			
-			final Spawn spawn = target.getSpawn();
-			if (spawn != null)
-			{
-				spawn.stopRespawn();
-				
-				if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
-				{
-					DBSpawnManager.getInstance().deleteSpawn(spawn, true);
-				}
-				else
-				{
-					SpawnTable.getInstance().deleteSpawn(spawn, true);
-				}
-			}
-			
-			BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
 		}
 		else
 		{
 			BuilderUtil.sendSysMessage(activeChar, "Incorrect target.");
 		}
 	}
+	
+	private void deleteNpc(PlayerInstance activeChar, Npc target)
+	{
+		target.deleteMe();
+		
+		final Spawn spawn = target.getSpawn();
+		if (spawn != null)
+		{
+			spawn.stopRespawn();
+			
+			if (DBSpawnManager.getInstance().isDefined(spawn.getId()))
+			{
+				DBSpawnManager.getInstance().deleteSpawn(spawn, true);
+			}
+			else
+			{
+				SpawnTable.getInstance().deleteSpawn(spawn, true);
+			}
+		}
+		
+		BuilderUtil.sendSysMessage(activeChar, "Deleted " + target.getName() + " from " + target.getObjectId() + ".");
+	}
 }