diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index def42bed1f..8e46008a76 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -447,7 +448,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index a53454e825..42f8f48185 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index a53454e825..42f8f48185 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index a53454e825..42f8f48185 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 30ea265ed2..461850b531 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index a53454e825..42f8f48185 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index a53454e825..42f8f48185 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 8586f2bb17..249581b121 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -491,7 +492,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance(); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index def42bed1f..8e46008a76 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; +import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.StatSet; @@ -447,7 +448,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); // Teleport player back - player.teleToLocation(player.getLastLocation(), null); + final Location lastLocation = player.getLastLocation(); + player.teleToLocation(lastLocation != null ? lastLocation : new Location(82201, 147587, -3473), null); // Restore player information final PlayerAppearance app = player.getAppearance();