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

Prevent setting region to null from within L2Object.

Browse Source
This commit is contained in:
MobiusDev 2018-09-07 16:46:53 +00:00
parent dac759a2d4
commit 25c1d5e28c
16 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -151,7 +151,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -229,16 +228,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1665,6 +1665,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Cancel all timers related to this Creature
TimersManager.getInstance().cancelTimers(getObjectId());
// Set world region to null.
setWorldRegion(null);
return true;
}

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -151,7 +151,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -229,16 +228,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1665,6 +1665,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Cancel all timers related to this Creature
TimersManager.getInstance().cancelTimers(getObjectId());
// Set world region to null.
setWorldRegion(null);
return true;
}

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -151,7 +151,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -229,16 +228,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1665,6 +1665,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Cancel all timers related to this Creature
TimersManager.getInstance().cancelTimers(getObjectId());
// Set world region to null.
setWorldRegion(null);
return true;
}

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -151,7 +151,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -229,16 +228,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1665,6 +1665,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Cancel all timers related to this Creature
TimersManager.getInstance().cancelTimers(getObjectId());
// Set world region to null.
setWorldRegion(null);
return true;
}

7
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -153,7 +153,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -231,16 +230,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2419,6 +2419,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
getAI().stopAITask();
}
// Set world region to null.
setWorldRegion(null);
return true;
}

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -151,7 +151,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -229,16 +228,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1665,6 +1665,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Cancel all timers related to this Creature
TimersManager.getInstance().cancelTimers(getObjectId());
// Set world region to null.
setWorldRegion(null);
return true;
}

7
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -151,7 +151,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -229,16 +228,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1665,6 +1665,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Cancel all timers related to this Creature
TimersManager.getInstance().cancelTimers(getObjectId());
// Set world region to null.
setWorldRegion(null);
return true;
}

7
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -151,7 +151,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
_isSpawned = false;
L2World.getInstance().removeVisibleObject(this, _worldRegion);
L2World.getInstance().removeObject(this);
setWorldRegion(null);
return true;
}
@ -229,16 +228,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
public final boolean isSpawned()
{
return _worldRegion != null;
return _isSpawned;
}
public final void setSpawned(boolean value)
{
_isSpawned = value;
if (!_isSpawned)
{
setWorldRegion(null);
}
}
@Override

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1665,6 +1665,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Cancel all timers related to this Creature
TimersManager.getInstance().cancelTimers(getObjectId());
// Set world region to null.
setWorldRegion(null);
return true;
}