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

Removed unused multi relation packet usage.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-04-30 22:31:10 +00:00
parent 26b4e465a1
commit 8cdca3e8cf
4 changed files with 21 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -4040,13 +4040,11 @@ public class Player extends Playable
final RelationCache oldrelation = getKnownRelations().get(player.getObjectId()); final RelationCache oldrelation = getKnownRelations().get(player.getObjectId());
if ((oldrelation == null) || (oldrelation.getRelation() != relation) || (oldrelation.isAutoAttackable() != isAutoAttackable)) if ((oldrelation == null) || (oldrelation.getRelation() != relation) || (oldrelation.isAutoAttackable() != isAutoAttackable))
{ {
final RelationChanged rc = new RelationChanged(); player.sendPacket(new RelationChanged(this, relation, isAutoAttackable));
rc.addRelation(this, relation, isAutoAttackable);
if (hasSummon()) if (hasSummon())
{ {
player.sendPacket(new RelationChanged(_summon, getRelation(player), isAutoAttackable(player))); player.sendPacket(new RelationChanged(_summon, relation, isAutoAttackable));
} }
player.sendPacket(rc);
getKnownRelations().put(player.getObjectId(), new RelationCache(relation, isAutoAttackable)); getKnownRelations().put(player.getObjectId(), new RelationCache(relation, isAutoAttackable));
} }
} }

77
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
View File

@@ -16,9 +16,6 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Playable;
import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -38,74 +35,30 @@ public class RelationChanged implements IClientOutgoingPacket
public static final int RELATION_MUTUAL_WAR = 0x08000; // double fist public static final int RELATION_MUTUAL_WAR = 0x08000; // double fist
public static final int RELATION_1SIDED_WAR = 0x10000; // single fist public static final int RELATION_1SIDED_WAR = 0x10000; // single fist
protected static class Relation private final int _objectId;
{ private final int _relation;
int _objId; private final int _autoAttackable;
int _relation; private final int _karma;
int _autoAttackable; private final int _pvpFlag;
int _karma;
int _pvpFlag;
}
private Relation _singled;
private List<Relation> _multi;
public RelationChanged(Playable activeChar, int relation, boolean autoattackable) public RelationChanged(Playable activeChar, int relation, boolean autoattackable)
{ {
_singled = new Relation(); _objectId = activeChar.getObjectId();
_singled._objId = activeChar.getObjectId(); _relation = relation;
_singled._relation = relation; _autoAttackable = autoattackable ? 1 : 0;
_singled._autoAttackable = autoattackable ? 1 : 0; _karma = activeChar.getKarma();
_singled._karma = activeChar.getKarma(); _pvpFlag = activeChar.getPvpFlag();
_singled._pvpFlag = activeChar.getPvpFlag();
}
public RelationChanged()
{
_multi = new ArrayList<>();
}
public void addRelation(Playable activeChar, int relation, boolean autoattackable)
{
if (activeChar.isInvisible())
{
return;
}
final Relation r = new Relation();
r._objId = activeChar.getObjectId();
r._relation = relation;
r._autoAttackable = autoattackable ? 1 : 0;
r._karma = activeChar.getKarma();
r._pvpFlag = activeChar.getPvpFlag();
_multi.add(r);
} }
@Override @Override
public boolean write(PacketWriter packet) public boolean write(PacketWriter packet)
{ {
OutgoingPackets.RELATION_CHANGED.writeId(packet); OutgoingPackets.RELATION_CHANGED.writeId(packet);
if (_multi == null) packet.writeD(_objectId);
{ packet.writeD(_relation);
packet.writeD(1); packet.writeD(_autoAttackable);
writeRelation(packet, _singled); packet.writeD(_karma);
} packet.writeD(_pvpFlag);
else
{
packet.writeD(_multi.size());
for (Relation r : _multi)
{
writeRelation(packet, r);
}
}
return true; return true;
} }
private void writeRelation(PacketWriter packet, Relation relation)
{
packet.writeD(relation._objId);
packet.writeD(relation._relation);
packet.writeD(relation._autoAttackable);
packet.writeD(relation._karma);
packet.writeD(relation._pvpFlag);
}
} }

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -4253,13 +4253,11 @@ public class Player extends Playable
final RelationCache oldrelation = getKnownRelations().get(player.getObjectId()); final RelationCache oldrelation = getKnownRelations().get(player.getObjectId());
if ((oldrelation == null) || (oldrelation.getRelation() != relation) || (oldrelation.isAutoAttackable() != isAutoAttackable)) if ((oldrelation == null) || (oldrelation.getRelation() != relation) || (oldrelation.isAutoAttackable() != isAutoAttackable))
{ {
final RelationChanged rc = new RelationChanged(); player.sendPacket(new RelationChanged(this, relation, isAutoAttackable));
rc.addRelation(this, relation, isAutoAttackable);
if (hasSummon()) if (hasSummon())
{ {
player.sendPacket(new RelationChanged(_summon, getRelation(player), isAutoAttackable(player))); player.sendPacket(new RelationChanged(_summon, relation, isAutoAttackable));
} }
player.sendPacket(rc);
getKnownRelations().put(player.getObjectId(), new RelationCache(relation, isAutoAttackable)); getKnownRelations().put(player.getObjectId(), new RelationCache(relation, isAutoAttackable));
} }
} }

6
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -4143,13 +4143,11 @@ public class Player extends Playable
final RelationCache oldrelation = getKnownRelations().get(player.getObjectId()); final RelationCache oldrelation = getKnownRelations().get(player.getObjectId());
if ((oldrelation == null) || (oldrelation.getRelation() != relation) || (oldrelation.isAutoAttackable() != isAutoAttackable)) if ((oldrelation == null) || (oldrelation.getRelation() != relation) || (oldrelation.isAutoAttackable() != isAutoAttackable))
{ {
final RelationChanged rc = new RelationChanged(); player.sendPacket(new RelationChanged(this, relation, isAutoAttackable));
rc.addRelation(this, relation, isAutoAttackable);
if (hasSummon()) if (hasSummon())
{ {
player.sendPacket(new RelationChanged(_summon, getRelation(player), isAutoAttackable(player))); player.sendPacket(new RelationChanged(_summon, relation, isAutoAttackable));
} }
player.sendPacket(rc);
getKnownRelations().put(player.getObjectId(), new RelationCache(relation, isAutoAttackable)); getKnownRelations().put(player.getObjectId(), new RelationCache(relation, isAutoAttackable));
} }
} }