Reformat and clean up "net" package

This commit is contained in:
P0nk
2021-09-09 23:26:02 +02:00
parent 69f4580637
commit 6be6ea9927
235 changed files with 3556 additions and 3398 deletions

View File

@@ -37,7 +37,6 @@ import tools.PacketCreator;
import java.util.Map;
/**
*
* @author Jay Estrella
* @author Ronan
*/
@@ -50,54 +49,54 @@ public final class MobDamageMobHandler extends AbstractPacketHandler {
boolean magic = p.readByte() == 0;
int dmg = p.readInt();
Character chr = c.getPlayer();
MapleMap map = chr.getMap();
Monster attacker = map.getMonsterByOid(from);
Monster damaged = map.getMonsterByOid(to);
if (attacker != null && damaged != null) {
int maxDmg = calcMaxDamage(attacker, damaged, magic); // thanks Darter (YungMoozi) for reporting unchecked dmg
if (dmg > maxDmg) {
AutobanFactory.DAMAGE_HACK.alert(c.getPlayer(), "Possible packet editing hypnotize damage exploit."); // thanks Rien dev team
FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " had hypnotized " + MonsterInformationProvider.getInstance().getMobNameFromId(attacker.getId()) + " to attack " + MonsterInformationProvider.getInstance().getMobNameFromId(damaged.getId()) + " with damage " + dmg + " (max: " + maxDmg + ")");
dmg = maxDmg;
}
map.damageMonster(chr, damaged, dmg);
map.broadcastMessage(chr, PacketCreator.damageMonster(to, dmg), false);
}
}
private static int calcMaxDamage(Monster attacker, Monster damaged, boolean magic) {
int attackerAtk, damagedDef, attackerLevel = attacker.getLevel();
double maxDamage;
if (magic) {
int atkRate = calcModifier(attacker, MonsterStatus.MAGIC_ATTACK_UP, MonsterStatus.MATK);
attackerAtk = (attacker.getStats().getMADamage() * atkRate) / 100;
int defRate = calcModifier(damaged, MonsterStatus.MAGIC_DEFENSE_UP, MonsterStatus.MDEF);
damagedDef = (damaged.getStats().getMDDamage() * defRate) / 100;
maxDamage = ((attackerAtk * (1.15 + (0.025 * attackerLevel))) - (0.75 * damagedDef)) * (Math.log(Math.abs(damagedDef - attackerAtk)) / Math.log(12));
} else {
int atkRate = calcModifier(attacker, MonsterStatus.WEAPON_ATTACK_UP, MonsterStatus.WATK);
attackerAtk = (attacker.getStats().getPADamage() * atkRate) / 100;
int defRate = calcModifier(damaged, MonsterStatus.WEAPON_DEFENSE_UP, MonsterStatus.WDEF);
damagedDef = (damaged.getStats().getPDDamage() * defRate) / 100;
maxDamage = ((attackerAtk * (1.15 + (0.025 * attackerLevel))) - (0.75 * damagedDef)) * (Math.log(Math.abs(damagedDef - attackerAtk)) / Math.log(17));
}
return (int) maxDamage;
}
private static int calcModifier(Monster monster, MonsterStatus buff, MonsterStatus nerf) {
int atkModifier;
final Map<MonsterStatus, MonsterStatusEffect> monsterStati = monster.getStati();
MonsterStatusEffect atkBuff = monsterStati.get(buff);
if (atkBuff != null) {
atkModifier = atkBuff.getStati().get(buff);
@@ -109,7 +108,7 @@ public final class MobDamageMobHandler extends AbstractPacketHandler {
if (atkNerf != null) {
atkModifier -= atkNerf.getStati().get(nerf);
}
return atkModifier;
}
}