Sync with L2jServer HighFive Sep 18th 2015.

This commit is contained in:
MobiusDev
2015-09-19 22:37:08 +00:00
parent 339cab601b
commit a2d764aaf8
134 changed files with 1440 additions and 1014 deletions

View File

@@ -45,7 +45,7 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
_z = cha.getZ();
_heading = cha.getHeading();
_mAtkSpd = cha.getMAtkSpd();
_pAtkSpd = cha.getPAtkSpd();
_pAtkSpd = (int) cha.getPAtkSpd();
_moveMultiplier = cha.getMovementSpeedMultiplier();
_runSpd = (int) Math.round(cha.getRunSpeed() / _moveMultiplier);
_walkSpd = (int) Math.round(cha.getWalkSpeed() / _moveMultiplier);

View File

@@ -83,7 +83,7 @@ public class CharInfo extends L2GameServerPacket
}
_heading = _activeChar.getHeading();
_mAtkSpd = _activeChar.getMAtkSpd();
_pAtkSpd = _activeChar.getPAtkSpd();
_pAtkSpd = (int) _activeChar.getPAtkSpd();
_attackSpeedMultiplier = _activeChar.getAttackSpeedMultiplier();
setInvisible(cha.isInvisible());

View File

@@ -265,7 +265,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
}
if (containsMask(NpcInfoType.ATK_CAST_SPEED))
{
writeD(_summon.getPAtkSpd());
writeD((int) _summon.getPAtkSpd());
writeD(_summon.getMAtkSpd());
}
if (containsMask(NpcInfoType.SPEED_MULTIPLIER))

View File

@@ -98,7 +98,7 @@ public class GMViewCharacterInfo extends L2GameServerPacket
writeD(0x00);
writeH(0x00);
writeD((int) _activeChar.getPAtk(null));
writeD(_activeChar.getPAtkSpd());
writeD((int) _activeChar.getPAtkSpd());
writeD((int) _activeChar.getPDef(null));
writeD(_activeChar.getEvasionRate(null));
writeD(_activeChar.getAccuracy());
@@ -106,7 +106,7 @@ public class GMViewCharacterInfo extends L2GameServerPacket
writeD((int) _activeChar.getMAtk(null, null));
writeD(_activeChar.getMAtkSpd());
writeD(_activeChar.getPAtkSpd());
writeD((int) _activeChar.getPAtkSpd());
writeD((int) _activeChar.getMDef(null, null));
writeD(_activeChar.getMagicEvasionRate(null));

View File

@@ -278,7 +278,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
}
if (containsMask(NpcInfoType.ATK_CAST_SPEED))
{
writeD(_npc.getPAtkSpd());
writeD((int) _npc.getPAtkSpd());
writeD(_npc.getMAtkSpd());
}
if (containsMask(NpcInfoType.SPEED_MULTIPLIER))

View File

@@ -93,7 +93,7 @@ public class PetInfo extends L2GameServerPacket
writeD(_summon.getHeading());
writeD(_summon.getStat().getMAtkSpd());
writeD(_summon.getStat().getPAtkSpd());
writeD((int) _summon.getStat().getPAtkSpd());
writeH(_runSpd);
writeH(_walkSpd);
@@ -164,7 +164,7 @@ public class PetInfo extends L2GameServerPacket
writeD(_summon.getMagicEvasionRate(null)); // magic evasion
writeD(_summon.getMCriticalHit(null, null)); // mcritical
writeD((int) _summon.getStat().getMoveSpeed());// speed
writeD(_summon.getPAtkSpd());// atkspeed
writeD((int) _summon.getPAtkSpd());// atkspeed
writeD(_summon.getMAtkSpd());// casting speed
writeC(0); // TODO: Check me, might be ride status

View File

@@ -264,7 +264,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
}
if (containsMask(NpcInfoType.ATK_CAST_SPEED))
{
writeD(_summon.getPAtkSpd());
writeD((int) _summon.getPAtkSpd());
writeD(_summon.getMAtkSpd());
}
if (containsMask(NpcInfoType.SPEED_MULTIPLIER))

View File

@@ -215,14 +215,14 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
writeH(56);
writeH(_activeChar.getActiveWeaponItem() != null ? 40 : 20);
writeD((int) _activeChar.getPAtk(null));
writeD(_activeChar.getPAtkSpd());
writeD((int) _activeChar.getPAtkSpd());
writeD((int) _activeChar.getPDef(null));
writeD(_activeChar.getEvasionRate(null));
writeD(_activeChar.getAccuracy());
writeD(_activeChar.getCriticalHit(null, null));
writeD((int) _activeChar.getMAtk(null, null));
writeD(_activeChar.getMAtkSpd());
writeD(_activeChar.getPAtkSpd()); // Seems like atk speed - 1
writeD((int) _activeChar.getPAtkSpd()); // Seems like atk speed - 1
writeD(_activeChar.getMagicEvasionRate(null));
writeD((int) _activeChar.getMDef(null, null));
writeD(_activeChar.getMagicAccuracy());