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

RelationChanged must not be send before CharInfo.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-10-14 10:26:06 +00:00
parent f324f0352f
commit 713b63d693
1 changed files with 12 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -13197,99 +13197,33 @@ public class PlayerInstance extends Playable
player.sendPacket(new CharInfo(this, isInvisible() && player.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS))); player.sendPacket(new CharInfo(this, isInvisible() && player.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS)));
player.sendPacket(new ExBrExtraUserInfo(this)); player.sendPacket(new ExBrExtraUserInfo(this));
final int relation1 = getRelation(player);
final int relation2 = player.getRelation(this);
final boolean isAutoAttackable1 = isAutoAttackable(player);
final boolean isAutoAttackable2 = player.isAutoAttackable(this);
RelationCache cache = getKnownRelations().get(player.getObjectId());
if ((cache == null) || (cache.getRelation() != relation1) || (cache.isAutoAttackable() != isAutoAttackable1))
{
player.sendPacket(new RelationChanged(this, relation1, isAutoAttackable1));
if (hasSummon())
{
player.sendPacket(new RelationChanged(_summon, relation1, isAutoAttackable1));
}
getKnownRelations().put(player.getObjectId(), new RelationCache(relation1, isAutoAttackable1));
}
cache = player.getKnownRelations().get(getObjectId());
if ((cache == null) || (cache.getRelation() != relation2) || (cache.isAutoAttackable() != isAutoAttackable2))
{
sendPacket(new RelationChanged(player, relation2, isAutoAttackable2));
if (player.hasSummon())
{
sendPacket(new RelationChanged(player.getSummon(), relation2, isAutoAttackable2));
}
player.getKnownRelations().put(getObjectId(), new RelationCache(relation2, isAutoAttackable2));
}
player.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); player.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition));
} }
else if (isInAirShip()) else if (isInAirShip())
{ {
setXYZ(getAirShip().getLocation()); setXYZ(getAirShip().getLocation());
player.sendPacket(new CharInfo(this, isInvisible() && player.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS))); player.sendPacket(new CharInfo(this, isInvisible() && player.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS)));
player.sendPacket(new ExBrExtraUserInfo(this)); player.sendPacket(new ExBrExtraUserInfo(this));
final int relation1 = getRelation(player);
final int relation2 = player.getRelation(this);
final boolean isAutoAttackable1 = isAutoAttackable(player);
final boolean isAutoAttackable2 = player.isAutoAttackable(this);
RelationCache cache = getKnownRelations().get(player.getObjectId());
if ((cache == null) || (cache.getRelation() != relation1) || (cache.isAutoAttackable() != isAutoAttackable1))
{
player.sendPacket(new RelationChanged(this, relation1, isAutoAttackable1));
if (hasSummon())
{
player.sendPacket(new RelationChanged(_summon, relation1, isAutoAttackable1));
}
getKnownRelations().put(player.getObjectId(), new RelationCache(relation1, isAutoAttackable1));
}
cache = player.getKnownRelations().get(getObjectId());
if ((cache == null) || (cache.getRelation() != relation2) || (cache.isAutoAttackable() != isAutoAttackable2))
{
sendPacket(new RelationChanged(player, relation2, isAutoAttackable2));
if (player.hasSummon())
{
sendPacket(new RelationChanged(player.getSummon(), relation2, isAutoAttackable2));
}
player.getKnownRelations().put(getObjectId(), new RelationCache(relation2, isAutoAttackable2));
}
player.sendPacket(new ExGetOnAirShip(this, getAirShip())); player.sendPacket(new ExGetOnAirShip(this, getAirShip()));
} }
else else
{ {
player.sendPacket(new CharInfo(this, isInvisible() && player.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS))); player.sendPacket(new CharInfo(this, isInvisible() && player.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS)));
player.sendPacket(new ExBrExtraUserInfo(this)); player.sendPacket(new ExBrExtraUserInfo(this));
}
final int relation1 = getRelation(player); final int relation = getRelation(player);
final int relation2 = player.getRelation(this); final boolean isAutoAttackable = isAutoAttackable(player);
final boolean isAutoAttackable1 = isAutoAttackable(player); final RelationCache cache = getKnownRelations().get(player.getObjectId());
final boolean isAutoAttackable2 = player.isAutoAttackable(this); if ((cache == null) || (cache.getRelation() != relation) || (cache.isAutoAttackable() != isAutoAttackable))
RelationCache cache = getKnownRelations().get(player.getObjectId());
if ((cache == null) || (cache.getRelation() != relation1) || (cache.isAutoAttackable() != isAutoAttackable1))
{ {
player.sendPacket(new RelationChanged(this, relation1, isAutoAttackable1)); player.sendPacket(new RelationChanged(this, relation, isAutoAttackable));
if (hasSummon()) if (hasSummon())
{ {
player.sendPacket(new RelationChanged(_summon, relation1, isAutoAttackable1)); player.sendPacket(new RelationChanged(_summon, relation, isAutoAttackable));
}
getKnownRelations().put(player.getObjectId(), new RelationCache(relation1, isAutoAttackable1));
}
cache = player.getKnownRelations().get(getObjectId());
if ((cache == null) || (cache.getRelation() != relation2) || (cache.isAutoAttackable() != isAutoAttackable2))
{
sendPacket(new RelationChanged(player, relation2, isAutoAttackable2));
if (player.hasSummon())
{
sendPacket(new RelationChanged(player.getSummon(), relation2, isAutoAttackable2));
}
player.getKnownRelations().put(getObjectId(), new RelationCache(relation2, isAutoAttackable2));
} }
getKnownRelations().put(player.getObjectId(), new RelationCache(relation, isAutoAttackable));
} }
switch (_privateStoreType) switch (_privateStoreType)