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

Player sendInfo now sends relations when asked.

Browse Source
This commit is contained in:
MobiusDev
2017-10-02 21:57:27 +00:00
parent f103c50fb3
commit 1e2f1c550a
4 changed files with 100 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -12119,45 +12119,38 @@ public final class L2PcInstance extends L2Playable
}
final int relation1 = getRelation(activeChar);
final RelationChanged rc1 = new RelationChanged();
rc1.addRelation(this, relation1, isAutoAttackable(activeChar));
if (hasSummon())
{
final L2Summon pet = getPet();
if (pet != null)
{
rc1.addRelation(pet, relation1, isAutoAttackable(activeChar));
}
if (hasServitors())
{
getServitors().values().forEach(s -> rc1.addRelation(s, relation1, isAutoAttackable(activeChar)));
}
}
activeChar.sendPacket(rc1);
final int relation2 = activeChar.getRelation(this);
Integer oldrelation = getKnownRelations().get(activeChar.getObjectId());
if ((oldrelation != null) && (oldrelation != relation1))
final RelationChanged rc2 = new RelationChanged();
rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this));
if (activeChar.hasSummon())
{
final RelationChanged rc = new RelationChanged();
rc.addRelation(this, relation1, isAutoAttackable(activeChar));
if (hasSummon())
final L2Summon pet = getPet();
if (pet != null)
{
final L2Summon pet = getPet();
if (pet != null)
{
rc.addRelation(pet, relation1, isAutoAttackable(activeChar));
}
if (hasServitors())
{
getServitors().values().forEach(s -> rc.addRelation(s, relation1, isAutoAttackable(activeChar)));
}
rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this));
}
activeChar.sendPacket(rc);
}
oldrelation = activeChar.getKnownRelations().get(getObjectId());
if ((oldrelation != null) && (oldrelation != relation2) && activeChar.isVisibleFor(this))
{
final RelationChanged rc = new RelationChanged();
rc.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this));
if (activeChar.hasSummon())
if (hasServitors())
{
final L2Summon pet = getPet();
if (pet != null)
{
rc.addRelation(pet, relation2, activeChar.isAutoAttackable(this));
}
if (hasServitors())
{
getServitors().values().forEach(s -> rc.addRelation(s, relation2, activeChar.isAutoAttackable(this)));
}
getServitors().values().forEach(s -> rc2.addRelation(s, relation2, activeChar.isAutoAttackable(this)));
}
sendPacket(rc);
}
sendPacket(rc2);
switch (getPrivateStoreType())
{