소스 검색

Mercenary guards do not respawn.

JIV 15 년 전
부모
커밋
64c86f1032

+ 1 - 9
L2_GameServer/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

@@ -21,7 +21,6 @@ import java.util.List;
 import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.AutoChatHandler;
@@ -359,14 +358,7 @@ public class MercTicketManager
 				AutoChatHandler.getInstance().registerChat(npc, messages, chatDelay);
 			
 			if (despawnDelay > 0)
-			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new Runnable() {
-					public void run()
-					{
-						npc.deleteMe();
-					}
-				}, despawnDelay);
-			}
+				npc.scheduleDespawn(despawnDelay);
 		}
 	}
 	

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java

@@ -164,6 +164,7 @@ public class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
+					spawn.stopRespawn();
 					if (isHired)
 					{
 						if (++hiredCount > hiredMax)