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

Static spawns should not have random heading.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-09-15 23:23:01 +00:00
parent 08f69599a9
commit ad8a96d8d7
48 changed files with 96 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}

1
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@ -388,7 +388,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
newlocy = loc.getY();
newlocz = loc.getZ();
setLocation(loc);
setHeading(-1);
}
else if ((getX() == 0) && (getY() == 0))
{

6
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -289,13 +289,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
return loc;
}
}
LOGGER.warning("Couldn't match location by chance turning first..");
LOGGER.warning("Couldn't match location by chance turning first...");
return null;
}
else if (_zone != null)
{
final Location loc = _zone.getRandomPoint();
loc.setHeading(Rnd.get(65535));
loc.setHeading(-1);
return loc;
}
else if (!_group.getTerritories().isEmpty())
@ -306,6 +306,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}
@ -318,6 +319,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
{
loc.setHeading(-1);
return loc;
}
}