Explorar o código

BETA: Reverting [4808], [4809]. Sorry for those misscommits, they werent intended for l2j, but for 1 private svn... i kinda commited on the wrong project :S
Well... that happens when you dont sleep.

Nik %!s(int64=13) %!d(string=hai) anos
pai
achega
65562d1efa

+ 0 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -382,15 +382,6 @@ public class ItemTable
 			L2World.getInstance().removeObject(item);
 			IdFactory.getInstance().releaseId(item.getObjectId());
 			
-			if (L2World.getInstance().findObject(item.getObjectId()) != null)
-			{
-				_log.warning("Deleted item not removed from objects map lol? Removing again.");
-				L2World.getInstance().removeObject(item);
-				
-				if (L2World.getInstance().findObject(item.getObjectId()) != null)
-					_log.warning("LOL!?!?!? tried to remove it but still not removed? omg?");
-			}
-			
 			if (Config.LOG_ITEMS)
 			{
 				if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || item.getItemId() == ADENA_ID)))

+ 0 - 25
L2J_Server_BETA/java/com/l2jserver/status/GameStatusThread.java

@@ -14,8 +14,6 @@
  */
 package com.l2jserver.status;
 
-import gnu.trove.TObjectProcedure;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -66,7 +64,6 @@ import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2ItemInstance;
-import com.l2jserver.gameserver.model.L2ItemInstance.ItemLocation;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.TradeList;
@@ -289,11 +286,6 @@ public class GameStatusThread extends Thread
 					_print.print(this.getServerStatus());
 					_print.flush();
 				}
-				else if (_usrCommand.equals("cleanvoiditems"))
-				{
-					L2World.getInstance().forEachObject(new CleanVoidItems());
-					_print.flush();
-				}
 				else if (_usrCommand.equals("forcegc"))
 				{
 					System.gc();
@@ -1324,21 +1316,4 @@ public class GameStatusThread extends Thread
 		}
 		throw new IllegalStateException("Deadlocked Thread not found");
 	}
-	
-	private final class CleanVoidItems implements TObjectProcedure<L2Object>
-	{	
-		@Override
-		public final boolean execute(final L2Object obj)
-		{
-			L2ItemInstance item = null;
-			if (obj instanceof L2ItemInstance)
-				item = (L2ItemInstance) obj;
-			if (item != null && item.getLocation() == ItemLocation.VOID)
-			{
-				_print.println("Item: name="+item.getName()+" lastChange="+item.getLastChange()+" objId"+item.getObjectId()+";");
-				L2World.getInstance().removeObject(item);
-			}
-			return true;
-		}
-	}
 }