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

Sync with L2jServer HighFive Feb 15th 2015.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

30
trunk/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java
View File

@ -27,9 +27,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.entity.Fort;
public final class FortSiegeGuardManager
@ -117,24 +115,16 @@ public final class FortSiegeGuardManager
ArrayList<L2Spawn> siegeGuardSpawns = new ArrayList<>();
while (rs.next())
{
L2NpcTemplate template = NpcData.getInstance().getTemplate(rs.getInt("npcId"));
if (template != null)
{
L2Spawn spawn = new L2Spawn(template);
spawn.setAmount(1);
spawn.setX(rs.getInt("x"));
spawn.setY(rs.getInt("y"));
spawn.setZ(rs.getInt("z"));
spawn.setHeading(rs.getInt("heading"));
spawn.setRespawnDelay(rs.getInt("respawnDelay"));
spawn.setLocationId(0);
siegeGuardSpawns.add(spawn);
}
else
{
_log.warning("Missing npc data in npc table for ID: " + rs.getInt("npcId"));
}
final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
spawn.setAmount(1);
spawn.setX(rs.getInt("x"));
spawn.setY(rs.getInt("y"));
spawn.setZ(rs.getInt("z"));
spawn.setHeading(rs.getInt("heading"));
spawn.setRespawnDelay(rs.getInt("respawnDelay"));
spawn.setLocationId(0);
siegeGuardSpawns.add(spawn);
}
_siegeGuards.put(fortId, siegeGuardSpawns);
}