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

Addition of INSTANCE_ORIGIN at PlayerVariables.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-09-26 10:43:41 +00:00
parent 358337b2b7
commit 78c0316f4f
57 changed files with 190 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";

3
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@ -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

11
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java
View File

@ -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;
}

1
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
View File

@ -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";