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

Attempt to fix wrong PvP flagging.

Browse Source
This commit is contained in:
MobiusDev
2015-03-25 13:08:04 +00:00
parent 82606870c0
commit ef15efb834
9 changed files with 155 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
View File

@@ -134,7 +134,7 @@ public class CharSelectionInfo extends L2GameServerPacket
writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High Five
writeD(charInfoPackage.getLevel());
writeD(charInfoPackage.getKarma());
writeD(charInfoPackage.getKarma() > 0 ? 0 /* 255? */: charInfoPackage.getReputation());
writeD(charInfoPackage.getPkKills());
writeD(charInfoPackage.getPvPKills());
@@ -146,8 +146,8 @@ public class CharSelectionInfo extends L2GameServerPacket
writeD(0x00);
writeD(0x00);
writeD(0x00); // Erthreia
writeD(0x00); // Erthreia
writeD(0x00); // Ertheia
writeD(0x00); // Ertheia
for (int slot : getPaperdollOrder())
{
@@ -278,6 +278,7 @@ public class CharSelectionInfo extends L2GameServerPacket
charInfopackage.setMaxMp(chardata.getInt("maxmp"));
charInfopackage.setCurrentMp(chardata.getDouble("curmp"));
charInfopackage.setKarma(chardata.getInt("karma"));
charInfopackage.setReputation(chardata.getInt("reputation"));
charInfopackage.setPkKills(chardata.getInt("pkkills"));
charInfopackage.setPvPKills(chardata.getInt("pvpkills"));
charInfopackage.setFace(chardata.getInt("face"));

8
trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java
View File

@@ -53,7 +53,7 @@ public final class RelationChanged extends L2GameServerPacket
protected static class Relation
{
int _objId, _relation, _autoAttackable, _karma, _pvpFlag;
int _objId, _relation, _autoAttackable, _reputation, _pvpFlag;
}
private Relation _singled;
@@ -68,7 +68,7 @@ public final class RelationChanged extends L2GameServerPacket
_singled._objId = activeChar.getObjectId();
_singled._relation = relation;
_singled._autoAttackable = autoattackable ? 1 : 0;
_singled._karma = activeChar.getKarma();
_singled._reputation = activeChar.getReputation();
_singled._pvpFlag = activeChar.getPvpFlag();
setInvisible(activeChar.isInvisible());
}
@@ -91,7 +91,7 @@ public final class RelationChanged extends L2GameServerPacket
r._objId = activeChar.getObjectId();
r._relation = relation;
r._autoAttackable = autoattackable ? 1 : 0;
r._karma = activeChar.getKarma();
r._reputation = activeChar.getReputation();
r._pvpFlag = activeChar.getPvpFlag();
_multi.add(r);
}
@@ -123,7 +123,7 @@ public final class RelationChanged extends L2GameServerPacket
{
writeD(relation._relation);
writeC(relation._autoAttackable);
writeD(relation._karma);
writeD(relation._reputation);
writeC(relation._pvpFlag);
}
}

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java
View File

@@ -300,7 +300,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
{
writeH(22);
writeC(_activeChar.getPvpFlag());
writeD(_activeChar.getKarma());
writeD(_activeChar.getReputation());
writeC(_activeChar.isNoble() ? 0x01 : 0x00);
writeC(_activeChar.isHero() ? 0x01 : 0x00);
writeC(_activeChar.getPledgeClass());