From 78c0316f4ff8d13a1d0214387f2d5457771e7213 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 26 Sep 2021 10:43:41 +0000 Subject: [PATCH] Addition of INSTANCE_ORIGIN at PlayerVariables. --- .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../gameserver/model/instancezone/Instance.java | 3 ++- .../model/instancezone/InstanceTemplate.java | 11 +++++++---- .../gameserver/model/variables/PlayerVariables.java | 1 + 57 files changed, 190 insertions(+), 95 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index b79b669a5c..2b0e1e9f72 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 2370050564..98cd208eaf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 2370050564..98cd208eaf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 2370050564..98cd208eaf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index ab3476e769..202c831f51 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 2370050564..98cd208eaf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 2370050564..98cd208eaf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 2370050564..98cd208eaf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 7b1668f7b6..584ff3ffcc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index c7187030f5..7a14a5058b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 7b1668f7b6..584ff3ffcc 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index de49454274..0887200b4d 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 137accbf86..6fef16284e 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 7b1668f7b6..584ff3ffcc 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index de49454274..0887200b4d 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 137accbf86..6fef16284e 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 97798481ba..6131d7cd82 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 97798481ba..6131d7cd82 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 97798481ba..6131d7cd82 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 7b1668f7b6..584ff3ffcc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 97798481ba..6131d7cd82 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 7b1668f7b6..584ff3ffcc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 97798481ba..6131d7cd82 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 7b1668f7b6..584ff3ffcc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 7c72d92598..990fa968e4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5f8b09aa95..487f5e1d99 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index d7a5b8345a..954de1bef0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 97798481ba..6131d7cd82 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c5e2db8633..76f488adaa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index de49454274..0887200b4d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 117891fbd3..74545b984a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c5e2db8633..76f488adaa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -1024,7 +1025,7 @@ public class Instance implements IIdentifiable, INamable // Set origin return location if enabled if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { - player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); + player.getVariables().set(PlayerVariables.INSTANCE_ORIGIN, player.getX() + ";" + player.getY() + ";" + player.getZ()); } // Remove player buffs diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index de49454274..0887200b4d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -383,11 +383,14 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl case ORIGIN: { final PlayerVariables vars = player.getVariables(); - final int[] loc = vars.getIntArray("INSTANCE_ORIGIN", ";"); - if ((loc != null) && (loc.length == 3)) + if (vars.contains(PlayerVariables.INSTANCE_ORIGIN)) { - location = new Location(loc[0], loc[1], loc[2]); - vars.remove("INSTANCE_ORIGIN"); + final int[] loc = vars.getIntArray(PlayerVariables.INSTANCE_ORIGIN, ";"); + if ((loc != null) && (loc.length == 3)) + { + location = new Location(loc[0], loc[1], loc[2]); + } + vars.remove(PlayerVariables.INSTANCE_ORIGIN); } break; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 0e3d0e76bc..4fc37e6c7e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -45,6 +45,7 @@ public class PlayerVariables extends AbstractVariables private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)"; // Public variable names + public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";