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

Ceremony Of Chaos teleport to null location check.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-11-19 23:13:47 +00:00
parent e54405b64a
commit 2ca588846a
9 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -447,7 +448,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -481,7 +482,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -491,7 +492,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();

4
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult;
import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager; import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Party.MessageType;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
@@ -447,7 +448,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED); player.sendPacket(ExCuriousHouseObserveMode.STATIC_DISABLED);
// Teleport player back // 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 // Restore player information
final PlayerAppearance app = player.getAppearance(); final PlayerAppearance app = player.getAppearance();