Faster access integer script value instead of StatSet.

This commit is contained in:
MobiusDevelopment 2020-01-28 00:16:37 +00:00
parent 49439e8db4
commit d63bf771ff
18 changed files with 173 additions and 104 deletions

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -237,16 +237,28 @@ public class NpcInstance extends Creature
setName(template.getName()); setName(template.getName());
} }
/**
* Receive the stored int value for this {@link NpcInstance}.
* @return stored script value
*/
public int getScriptValue() public int getScriptValue()
{ {
return _scriptValue; return _scriptValue;
} }
/**
* Sets the script value related with this {@link NpcInstance}.
* @param value value to store
*/
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
_scriptValue = value; _scriptValue = value;
} }
/**
* @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise
*/
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return _scriptValue == value; return _scriptValue == value;
@ -2964,8 +2976,7 @@ public class NpcInstance extends Creature
} }
/** /**
* Set the spawn of the NpcInstance.<BR> * Set the spawn of the NpcInstance.
* <BR>
* @param spawn The Spawn that manage the NpcInstance * @param spawn The Spawn that manage the NpcInstance
*/ */
public void setSpawn(Spawn spawn) public void setSpawn(Spawn spawn)
@ -3014,6 +3025,9 @@ public class NpcInstance extends Creature
{ {
_spawn.decreaseCount(this); _spawn.decreaseCount(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**

View File

@ -150,6 +150,9 @@ public class Npc extends Creature
private int _shotsMask = 0; private int _shotsMask = 0;
private int _killingBlowWeaponId; private int _killingBlowWeaponId;
private int _scriptValue = 0;
/** Map of summoned NPCs by this NPC. */ /** Map of summoned NPCs by this NPC. */
private Map<Integer, Npc> _summonedNpcs = null; private Map<Integer, Npc> _summonedNpcs = null;
@ -1331,6 +1334,9 @@ public class Npc extends Creature
{ {
((Npc) summoner).removeSummonedNpc(getObjectId()); ((Npc) summoner).removeSummonedNpc(getObjectId());
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1661,31 +1667,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -150,6 +150,9 @@ public class Npc extends Creature
private int _shotsMask = 0; private int _shotsMask = 0;
private int _killingBlowWeaponId; private int _killingBlowWeaponId;
private int _scriptValue = 0;
/** Map of summoned NPCs by this NPC. */ /** Map of summoned NPCs by this NPC. */
private Map<Integer, Npc> _summonedNpcs = null; private Map<Integer, Npc> _summonedNpcs = null;
@ -1331,6 +1334,9 @@ public class Npc extends Creature
{ {
((Npc) summoner).removeSummonedNpc(getObjectId()); ((Npc) summoner).removeSummonedNpc(getObjectId());
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1661,31 +1667,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -150,6 +150,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1148,6 +1149,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1418,31 +1422,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -150,6 +150,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1148,6 +1149,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1418,31 +1422,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -150,6 +150,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1148,6 +1149,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1418,31 +1422,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**

View File

@ -149,6 +149,7 @@ public class Npc extends Creature
private NpcStringId _nameString; private NpcStringId _nameString;
private StatSet _params; private StatSet _params;
private int _scriptValue = 0;
private RaidBossStatus _raidStatus; private RaidBossStatus _raidStatus;
/** Contains information about local tax payments. */ /** Contains information about local tax payments. */
@ -1136,6 +1137,9 @@ public class Npc extends Creature
{ {
instance.removeNpc(this); instance.removeNpc(this);
} }
// Clear script value
_scriptValue = 0;
} }
/** /**
@ -1406,31 +1410,30 @@ public class Npc extends Creature
} }
/** /**
* Short wrapper for backward compatibility * Receive the stored int value for this {@link Npc} instance.
* @return stored script value * @return stored script value
*/ */
public int getScriptValue() public int getScriptValue()
{ {
return getVariables().getInt("SCRIPT_VAL"); return _scriptValue;
} }
/** /**
* Short wrapper for backward compatibility. Stores script value * Sets the script value related with this {@link Npc} instance.
* @param value value to store * @param value value to store
*/ */
public void setScriptValue(int value) public void setScriptValue(int value)
{ {
getVariables().set("SCRIPT_VAL", value); _scriptValue = value;
} }
/** /**
* Short wrapper for backward compatibility.
* @param value value to store * @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise * @return {@code true} if stored script value equals given value, {@code false} otherwise
*/ */
public boolean isScriptValue(int value) public boolean isScriptValue(int value)
{ {
return getVariables().getInt("SCRIPT_VAL") == value; return _scriptValue == value;
} }
/** /**