From 24482307643a89a6a3e5bd6ef358f323e16b3053 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 18 Sep 2019 22:01:03 +0000 Subject: [PATCH] Reset initial monster position on delete. --- .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 9 +++++++++ 14 files changed, 126 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4ff4745460..c50a086a26 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4ff4745460..c50a086a26 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1959558ed6..45cb122680 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1959558ed6..45cb122680 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1959558ed6..45cb122680 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1959558ed6..45cb122680 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1959558ed6..45cb122680 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java index ef34e5d422..1a7374d446 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2468,6 +2468,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8a6147c013..38ff78f500 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1721,6 +1721,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8a6147c013..38ff78f500 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1721,6 +1721,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8a6147c013..38ff78f500 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1721,6 +1721,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index ba2cd65a40..3facf4b8c0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index ba2cd65a40..3facf4b8c0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index ba2cd65a40..3facf4b8c0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1722,6 +1722,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe // Set world region to null. setWorldRegion(null); + // Reset initial monster position. + if (isMonster() && (((Npc) this).getSpawn() != null)) + { + ThreadPool.schedule(() -> + { + setXYZ(0, 0, -10000); + }, 5000); + } + return true; }