Sync with L2jServer HighFive Feb 15th 2015.

This commit is contained in:
mobius
2015-02-15 23:48:35 +00:00
parent f2d6aedabe
commit 06c765ea63
45 changed files with 474 additions and 843 deletions

View File

@@ -35,7 +35,6 @@ import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.data.xml.impl.SiegeScheduleData;
import com.l2jserver.gameserver.enums.SiegeClanType;
import com.l2jserver.gameserver.enums.SiegeTeleportWhoType;
@@ -1552,7 +1551,7 @@ public class Siege implements Siegable
{
try
{
final L2Spawn spawn = new L2Spawn(NpcData.getInstance().getTemplate(ts.getId()));
final L2Spawn spawn = new L2Spawn(ts.getId());
spawn.setLocation(ts.getLocation());
_controlTowers.add((L2ControlTowerInstance) spawn.doSpawn());
}
@@ -1573,7 +1572,7 @@ public class Siege implements Siegable
{
try
{
final L2Spawn spawn = new L2Spawn(NpcData.getInstance().getTemplate(ts.getId()));
final L2Spawn spawn = new L2Spawn(ts.getId());
spawn.setLocation(ts.getLocation());
final L2FlameTowerInstance tower = (L2FlameTowerInstance) spawn.doSpawn();
tower.setUpgradeLevel(ts.getUpgradeLevel());