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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java
View File

@ -40,7 +40,7 @@ import org.w3c.dom.Node;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.engines.DocumentParser;
import com.l2jserver.gameserver.data.xml.IXmlReader;
import com.l2jserver.gameserver.enums.ManorMode;
import com.l2jserver.gameserver.model.CropProcure;
import com.l2jserver.gameserver.model.L2Clan;
@ -58,7 +58,7 @@ import com.l2jserver.util.Rnd;
* Castle manor system.
* @author malyelfik
*/
public final class CastleManorManager implements DocumentParser, IStorable
public final class CastleManorManager implements IXmlReader, IStorable
{
// SQL queries
private static final String INSERT_PRODUCT = "INSERT INTO castle_manor_production VALUES (?, ?, ?, ?, ?, ?)";

2
trunk/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java
View File

@ -28,7 +28,7 @@ import java.util.logging.Logger;
import javolution.util.FastMap;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.StatsSet;

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

@ -28,7 +28,7 @@ import javolution.util.FastList;
import javolution.util.FastMap;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.NpcData;
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;

6
trunk/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java
View File

@ -37,8 +37,8 @@ import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.instancemanager.tasks.FourSepulchersChangeAttackTimeTask;
import com.l2jserver.gameserver.instancemanager.tasks.FourSepulchersChangeCoolDownTimeTask;
@ -1501,7 +1501,7 @@ public final class FourSepulchersManager
{
try
{
L2DoorInstance door = DoorTable.getInstance().getDoor(doorId);
L2DoorInstance door = DoorData.getInstance().getDoor(doorId);
if (door != null)
{
door.closeMe();

2
trunk/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java
View File

@ -37,7 +37,7 @@ import javolution.util.FastMap;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.instancemanager.tasks.GrandBossManagerStoreTask;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.Location;

4
trunk/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java
View File

@ -32,7 +32,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.engines.DocumentParser;
import com.l2jserver.gameserver.data.xml.IXmlReader;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Instance;
import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
@ -40,7 +40,7 @@ import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
/**
* @author evill33t, GodKratos
*/
public final class InstanceManager implements DocumentParser
public final class InstanceManager implements IXmlReader
{
private static final Map<Integer, Instance> _instanceList = new FastMap<>();
private final Map<Integer, InstanceWorld> _instanceWorlds = new FastMap<>();

4
trunk/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java
View File

@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jserver.Config;
import com.l2jserver.gameserver.engines.DocumentParser;
import com.l2jserver.gameserver.data.xml.IXmlReader;
import com.l2jserver.gameserver.model.L2MapRegion;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.Location;
@ -46,7 +46,7 @@ import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
/**
* @author Nyaran
*/
public final class MapRegionManager implements DocumentParser
public final class MapRegionManager implements IXmlReader
{
private static final Map<String, L2MapRegion> _regions = new HashMap<>();
private static final String defaultRespawn = "talking_island_town";

2
trunk/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java
View File

@ -29,7 +29,7 @@ import java.util.logging.Logger;
import javolution.util.FastList;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.enums.ItemLocation;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.L2World;

4
trunk/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
import java.util.logging.Logger;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.PetitionState;
import com.l2jserver.gameserver.model.Petition;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -425,7 +425,7 @@ public final class PetitionManager
// Notify all GMs that a new petition has been submitted.
final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ").";
AdminTable.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
return newPetitionId;
}

2
trunk/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java
View File

@ -33,7 +33,7 @@ import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.StatsSet;

2
trunk/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java
View File

@ -28,7 +28,7 @@ import java.util.logging.Logger;
import javolution.util.FastList;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

4
trunk/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java
View File

@ -29,7 +29,7 @@ import org.w3c.dom.Node;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.engines.DocumentParser;
import com.l2jserver.gameserver.data.xml.IXmlReader;
import com.l2jserver.gameserver.instancemanager.tasks.StartMovingTask;
import com.l2jserver.gameserver.model.L2NpcWalkerNode;
import com.l2jserver.gameserver.model.L2WalkRoute;
@ -50,7 +50,7 @@ import com.l2jserver.gameserver.util.Broadcast;
* This class manages walking monsters.
* @author GKR
*/
public final class WalkingManager implements DocumentParser
public final class WalkingManager implements IXmlReader
{
// Repeat style:
// 0 - go back

4
trunk/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java
View File

@ -32,7 +32,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jserver.gameserver.engines.DocumentParser;
import com.l2jserver.gameserver.data.xml.IXmlReader;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.L2WorldRegion;
@ -54,7 +54,7 @@ import com.l2jserver.gameserver.model.zone.type.NpcSpawnTerritory;
* This class manages the zones
* @author durgus
*/
public final class ZoneManager implements DocumentParser
public final class ZoneManager implements IXmlReader
{
private static final Map<String, AbstractZoneSettings> _settings = new HashMap<>();