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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
trunk/java/com/l2jserver/gameserver/model/L2Object.java
View File

@@ -33,6 +33,7 @@ import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList;
import com.l2jserver.gameserver.model.actor.poly.ObjectPoly;
@@ -834,10 +835,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
sendInstanceUpdate(newI, false);
}
}
if (player.hasSummon())
final L2Summon pet = player.getPet();
if (pet != null)
{
player.getSummon().setInstanceId(instanceId);
pet.setInstanceId(instanceId);
}
player.getServitors().values().forEach(s -> s.setInstanceId(instanceId));
}
else if (isNpc())
{
@@ -1017,4 +1020,4 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
{
return (getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]");
}
}
}