Sync with L2jServer HighFive Dec 21st 2015.

This commit is contained in:
MobiusDev
2015-12-21 11:05:04 +00:00
parent 130fa65bbd
commit 4bfbad7c46
74 changed files with 2194 additions and 307 deletions

View File

@@ -86,6 +86,8 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
private final Deque<L2Npc> _spawnedNpcs = new ConcurrentLinkedDeque<>();
private Map<Integer, Location> _lastSpawnPoints;
private boolean _isNoRndWalk = false; // Is no random walk
private String _areaName;
private int _globalMapId;
/** The task launching the function doSpawn() */
class SpawnTask implements Runnable
@@ -305,7 +307,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
public void setXYZ(ILocational loc)
{
setXYZ(loc.getX(), loc.getY(), loc.getZ());
}
/**
@@ -830,12 +831,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
_location.setInstanceId(instanceId);
}
@Override
public String toString()
{
return "L2Spawn ID: " + getId() + " " + getLocation();
}
public final boolean isNoRndWalk()
{
return _isNoRndWalk;
@@ -845,4 +840,30 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
{
_isNoRndWalk = value;
}
public String getAreaName()
{
return _areaName;
}
public void setAreaName(String areaName)
{
_areaName = areaName;
}
public int getGlobalMapId()
{
return _globalMapId;
}
public void setGlobalMapId(int globalMapId)
{
_globalMapId = globalMapId;
}
@Override
public String toString()
{
return "L2Spawn ID: " + getId() + " " + getLocation();
}
}