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

Deletion must handle instances as well.

Browse Source
This commit is contained in:
MobiusDev
2018-04-12 12:00:55 +00:00
parent 80103efae2
commit 7c9ca42499
7 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3037,13 +3037,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
((L2Npc) summoner).removeSummonedNpc(getObjectId()); ((L2Npc) summoner).removeSummonedNpc(getObjectId());
} }
L2World.getInstance().removeObject(this);
final L2Spawn spawn = npc.getSpawn(); final L2Spawn spawn = npc.getSpawn();
if ((spawn != null) && spawn.isRespawnEnabled()) if ((spawn != null) && spawn.isRespawnEnabled())
{ {
spawn.decreaseCount(npc); spawn.decreaseCount(npc);
spawn.doSpawn();
} }
final Instance instance = getInstanceWorld();
if (instance != null)
{
instance.removeNpc(npc);
}
L2World.getInstance().removeObject(this);
} }
else else
{ {

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

@@ -3037,13 +3037,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
((L2Npc) summoner).removeSummonedNpc(getObjectId()); ((L2Npc) summoner).removeSummonedNpc(getObjectId());
} }
L2World.getInstance().removeObject(this);
final L2Spawn spawn = npc.getSpawn(); final L2Spawn spawn = npc.getSpawn();
if ((spawn != null) && spawn.isRespawnEnabled()) if ((spawn != null) && spawn.isRespawnEnabled())
{ {
spawn.decreaseCount(npc); spawn.decreaseCount(npc);
spawn.doSpawn();
} }
final Instance instance = getInstanceWorld();
if (instance != null)
{
instance.removeNpc(npc);
}
L2World.getInstance().removeObject(this);
} }
else else
{ {

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

@@ -3037,13 +3037,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
((L2Npc) summoner).removeSummonedNpc(getObjectId()); ((L2Npc) summoner).removeSummonedNpc(getObjectId());
} }
L2World.getInstance().removeObject(this);
final L2Spawn spawn = npc.getSpawn(); final L2Spawn spawn = npc.getSpawn();
if ((spawn != null) && spawn.isRespawnEnabled()) if ((spawn != null) && spawn.isRespawnEnabled())
{ {
spawn.decreaseCount(npc); spawn.decreaseCount(npc);
spawn.doSpawn();
} }
final Instance instance = getInstanceWorld();
if (instance != null)
{
instance.removeNpc(npc);
}
L2World.getInstance().removeObject(this);
} }
else else
{ {

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

@@ -3037,13 +3037,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
((L2Npc) summoner).removeSummonedNpc(getObjectId()); ((L2Npc) summoner).removeSummonedNpc(getObjectId());
} }
L2World.getInstance().removeObject(this);
final L2Spawn spawn = npc.getSpawn(); final L2Spawn spawn = npc.getSpawn();
if ((spawn != null) && spawn.isRespawnEnabled()) if ((spawn != null) && spawn.isRespawnEnabled())
{ {
spawn.decreaseCount(npc); spawn.decreaseCount(npc);
spawn.doSpawn();
} }
final Instance instance = getInstanceWorld();
if (instance != null)
{
instance.removeNpc(npc);
}
L2World.getInstance().removeObject(this);
} }
else else
{ {

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

@@ -4032,13 +4032,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
((L2Npc) summoner).removeSummonedNpc(getObjectId()); ((L2Npc) summoner).removeSummonedNpc(getObjectId());
} }
L2World.getInstance().removeObject(this);
final L2Spawn spawn = npc.getSpawn(); final L2Spawn spawn = npc.getSpawn();
if ((spawn != null) && spawn.isRespawnEnabled()) if ((spawn != null) && spawn.isRespawnEnabled())
{ {
spawn.decreaseCount(npc); spawn.decreaseCount(npc);
spawn.doSpawn();
} }
final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
if (instance != null)
{
instance.removeNpc(npc);
}
L2World.getInstance().removeObject(this);
} }
else else
{ {

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

@@ -3037,13 +3037,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
((L2Npc) summoner).removeSummonedNpc(getObjectId()); ((L2Npc) summoner).removeSummonedNpc(getObjectId());
} }
L2World.getInstance().removeObject(this);
final L2Spawn spawn = npc.getSpawn(); final L2Spawn spawn = npc.getSpawn();
if ((spawn != null) && spawn.isRespawnEnabled()) if ((spawn != null) && spawn.isRespawnEnabled())
{ {
spawn.decreaseCount(npc); spawn.decreaseCount(npc);
spawn.doSpawn();
} }
final Instance instance = getInstanceWorld();
if (instance != null)
{
instance.removeNpc(npc);
}
L2World.getInstance().removeObject(this);
} }
else else
{ {

8
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -3037,13 +3037,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
((L2Npc) summoner).removeSummonedNpc(getObjectId()); ((L2Npc) summoner).removeSummonedNpc(getObjectId());
} }
L2World.getInstance().removeObject(this);
final L2Spawn spawn = npc.getSpawn(); final L2Spawn spawn = npc.getSpawn();
if ((spawn != null) && spawn.isRespawnEnabled()) if ((spawn != null) && spawn.isRespawnEnabled())
{ {
spawn.decreaseCount(npc); spawn.decreaseCount(npc);
spawn.doSpawn();
} }
final Instance instance = getInstanceWorld();
if (instance != null)
{
instance.removeNpc(npc);
}
L2World.getInstance().removeObject(this);
} }
else else
{ {