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

Updated IXmlReader to match newer branches.

Browse Source
This commit is contained in:
MobiusDev
2018-04-03 18:15:04 +00:00
parent 9f35fd7fe6
commit 81d82a90ac
54 changed files with 1050 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.npc.ForgeOfTheGods;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -26,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
import com.l2jmobius.gameserver.model.L2Spawn;
@@ -38,7 +39,7 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
* Tar Beetle zone spawn
* @author malyelfik
*/
public class TarBeetleSpawn implements IXmlReader
public class TarBeetleSpawn implements IGameXmlReader
{
private final List<SpawnZone> zones = new ArrayList<>();
private ScheduledFuture<?> spawnTask;
@@ -61,7 +62,7 @@ public class TarBeetleSpawn implements IXmlReader
}
@Override
public void parseDocument(Document doc)
public void parseDocument(Document doc, File f)
{
int i = 0;
for (Node d = doc.getFirstChild(); d != null; d = d.getNextSibling())
@@ -97,11 +98,11 @@ public class TarBeetleSpawn implements IXmlReader
final Zone bannedZone = new Zone();
final int bMinZ = parseInteger(attrs, "minZ");
final int bMaxZ = parseInteger(attrs, "maxZ");
for (Node f = c.getFirstChild(); f != null; f = f.getNextSibling())
for (Node h = c.getFirstChild(); h != null; h = h.getNextSibling())
{
if (f.getNodeName().equals("point"))
if (h.getNodeName().equals("point"))
{
attrs = f.getAttributes();
attrs = h.getAttributes();
final int x = parseInteger(attrs, "x");
final int y = parseInteger(attrs, "y");
bannedZone.add(x, y, bMinZ, bMaxZ, 0);

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.npc.NpcBuffers;
import java.io.File;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -26,13 +27,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.model.StatsSet;
/**
* @author UnAfraid
*/
public class NpcBuffersData implements IXmlReader
public class NpcBuffersData implements IGameXmlReader
{
private final Map<Integer, NpcBufferData> _npcBuffers = new HashMap<>();
@@ -49,7 +50,7 @@ public class NpcBuffersData implements IXmlReader
}
@Override
public void parseDocument(Document doc)
public void parseDocument(Document doc, File f)
{
StatsSet set;
Node attr;

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundPointData.java vendored
View File

@@ -16,6 +16,7 @@
*/
package hellbound;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -23,13 +24,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.commons.util.IGameXmlReader;
/**
* Point data parser.
* @author Zoey76
*/
public final class HellboundPointData implements IXmlReader
public final class HellboundPointData implements IGameXmlReader
{
private final Map<Integer, int[]> _pointsInfo = new HashMap<>();
@@ -47,7 +48,7 @@ public final class HellboundPointData implements IXmlReader
}
@Override
public void parseDocument(Document doc)
public void parseDocument(Document doc, File f)
{
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
{

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundSpawns.java vendored
View File

@@ -16,6 +16,7 @@
*/
package hellbound;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -25,7 +26,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.datatables.SpawnTable;
import com.l2jmobius.gameserver.model.L2Spawn;
import com.l2jmobius.gameserver.model.Location;
@@ -34,7 +35,7 @@ import com.l2jmobius.gameserver.model.Location;
* Hellbound Spawns parser.
* @author Zoey76
*/
public final class HellboundSpawns implements IXmlReader
public final class HellboundSpawns implements IGameXmlReader
{
private final List<L2Spawn> _spawns = new ArrayList<>();
private final Map<Integer, int[]> _spawnLevels = new HashMap<>();
@@ -54,7 +55,7 @@ public final class HellboundSpawns implements IXmlReader
}
@Override
public void parseDocument(Document doc)
public void parseDocument(Document doc, File f)
{
for (Node node = doc.getFirstChild(); node != null; node = node.getNextSibling())
{

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java vendored
View File

@@ -16,6 +16,7 @@
*/
package instances.FinalEmperialTomb;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -31,7 +32,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -74,7 +75,7 @@ import instances.AbstractInstance;
* Use proper zone spawn system.
* @author Gigiikun
*/
public final class FinalEmperialTomb extends AbstractInstance implements IXmlReader
public final class FinalEmperialTomb extends AbstractInstance implements IGameXmlReader
{
protected class FETWorld extends InstanceWorld
{
@@ -258,7 +259,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IXmlRea
}
@Override
public void parseDocument(Document doc)
public void parseDocument(Document doc, File f)
{
final Node first = doc.getFirstChild();
if ((first != null) && "list".equalsIgnoreCase(first.getNodeName()))

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/zones/no_bookmark.xml vendored
View File

@@ -2813,7 +2813,7 @@
<node X="145760" Y="-47633" />
<node X="145415" Y="-47471" />
</zone>
<zone name="no_bookmark_rune_slow_1" type="ConditionZone" shape="NPoly" minZ="509" maxZ="09">
<zone name="no_bookmark_rune_slow_1" type="ConditionZone" shape="NPoly" minZ="509" maxZ="9">
<stat name="NoBookmark" val="true" />
<node X="13785" Y="-47663" />
<node X="14046" Y="-47854" />
@@ -2827,7 +2827,7 @@
<node X="14052" Y="-50447" />
<node X="13788" Y="-50647" />
</zone>
<zone name="no_bookmark_rune_damage_1" type="ConditionZone" shape="NPoly" minZ="509" maxZ="09">
<zone name="no_bookmark_rune_damage_1" type="ConditionZone" shape="NPoly" minZ="509" maxZ="9">
<stat name="NoBookmark" val="true" />
<node X="13785" Y="-47663" />
<node X="14046" Y="-47854" />