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

Additional checks for monster teleport to spawn.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-09-20 04:00:07 +00:00
parent 5831dedf05
commit b5e45cea48
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -811,7 +811,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && (npc.getInstanceId() == 0)) if (npc.isMonster() && (npc.getSpawn() != null) && (npc.getInstanceId() == 0) && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@ -669,7 +669,7 @@ public class AttackableAI extends CreatureAI
} }
// Monster teleport to spawn // Monster teleport to spawn
if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance()) if (npc.isMonster() && (npc.getSpawn() != null) && !npc.isInInstance() && (npc.isInCombat() || World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty()))
{ {
npc.teleToLocation(npc.getSpawn(), false); npc.teleToLocation(npc.getSpawn(), false);
} }