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

Removed stream usage from NpcSpawnTemplate.

Browse Source
This commit is contained in:
MobiusDevelopment 2023-01-08 12:35:31 +00:00
parent e3c767faf9
commit 377769f5d2
26 changed files with 858 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

35
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

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

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;

35
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.holders.MinionHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.interfaces.IParameterized;
import org.l2jmobius.gameserver.model.zone.type.BannedSpawnTerritory;
import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
/**
@ -304,7 +305,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_group.getBannedTerritories().isEmpty() || _group.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_group.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _group.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;
@ -317,7 +333,22 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
for (int i = 0; i < 100; i++)
{
final Location loc = territory.getRandomPoint();
if (_spawnTemplate.getBannedTerritories().isEmpty() || _spawnTemplate.getBannedTerritories().stream().allMatch(bannedTerritory -> !bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ())))
if (_spawnTemplate.getBannedTerritories().isEmpty())
{
loc.setHeading(-1);
return loc;
}
boolean insideBannedTerritory = false;
SEARCH: for (BannedSpawnTerritory bannedTerritory : _spawnTemplate.getBannedTerritories())
{
if (bannedTerritory.isInsideZone(loc.getX(), loc.getY(), loc.getZ()))
{
insideBannedTerritory = true;
break SEARCH;
}
}
if (!insideBannedTerritory)
{
loc.setHeading(-1);
return loc;