瀏覽代碼

Fix for Instance NPE. Thx Edoo for testing

Gigiikun 16 年之前
父節點
當前提交
4f6c8ba5a0

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/instancemanager/InstanceManager.java

@@ -141,8 +141,8 @@ public class InstanceManager
 			return false;
 		
 		Instance instance = new Instance(id);
-		instance.loadInstanceTemplate(template);
 		_instanceList.put(id, instance);
+		instance.loadInstanceTemplate(template);
 		return true;
 	}
 	

+ 1 - 2
L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Instance.java

@@ -432,8 +432,7 @@ public class Instance
 							else
 								spawnDat.startRespawn();
 							spawnDat.setInstanceId(getId());
-							L2Npc newmob = spawnDat.doSpawn();
-							_npcs.add(newmob);
+							spawnDat.doSpawn();
 						}
 						else
 						{