lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Feb 10th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-10 22:49:31 +00:00
parent 4dc2666fa4
commit 431b4cacdf
98 changed files with 636 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/java/com/l2jserver/gameserver/model/L2Spawn.java
View File

@ -31,7 +31,6 @@ import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.data.sql.impl.TerritoryTable;
import com.l2jserver.gameserver.datatables.NpcPersonalAIData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
@ -145,7 +144,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
String className = "com.l2jserver.gameserver.model.actor.instance." + _template.getType() + "Instance";
// Create the generic constructor of L2Npc managed by this L2Spawn
_constructor = Class.forName(className).asSubclass(L2Npc.class).getConstructor(int.class, L2NpcTemplate.class);
_constructor = Class.forName(className).asSubclass(L2Npc.class).getConstructor(L2NpcTemplate.class);
}
/**
@ -527,7 +526,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
}
// Call the constructor of the L2Npc
L2Npc npc = _constructor.newInstance(IdFactory.getInstance().getNextId(), _template);
L2Npc npc = _constructor.newInstance(_template);
npc.setInstanceId(getInstanceId()); // Must be done before object is spawned into visible world
if (isSummonSpawn)
{