From 2d40a89c557afa967f393e0cdcbfa3aa10a87e14 Mon Sep 17 00:00:00 2001 From: P0nk Date: Sat, 17 Aug 2024 18:51:50 +0200 Subject: [PATCH] Overload damageMonster for when no delay is needed --- .../java/client/command/commands/gm3/KillAllCommand.java | 2 +- .../server/channel/handlers/AbstractDealDamageHandler.java | 4 ++-- .../net/server/channel/handlers/FieldDamageMobHandler.java | 2 +- .../net/server/channel/handlers/MobDamageMobHandler.java | 2 +- .../net/server/channel/handlers/SummonDamageHandler.java | 2 +- .../java/net/server/channel/handlers/TakeDamageHandler.java | 4 ++-- src/main/java/server/maps/MapleMap.java | 6 ++---- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/client/command/commands/gm3/KillAllCommand.java b/src/main/java/client/command/commands/gm3/KillAllCommand.java index 398f270008..787e48343f 100644 --- a/src/main/java/client/command/commands/gm3/KillAllCommand.java +++ b/src/main/java/client/command/commands/gm3/KillAllCommand.java @@ -49,7 +49,7 @@ public class KillAllCommand extends Command { for (MapObject monstermo : monsters) { Monster monster = (Monster) monstermo; if (!monster.getStats().isFriendly() && !(monster.getId() >= MobId.DEAD_HORNTAIL_MIN && monster.getId() <= MobId.HORNTAIL)) { - map.damageMonster(player, monster, Integer.MAX_VALUE, (short) 0); + map.damageMonster(player, monster, Integer.MAX_VALUE); count++; } } diff --git a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java index cea8b1a937..3ff31dcce6 100644 --- a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java @@ -591,11 +591,11 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { if (animationTime > 0) { // be sure to only use LIMITED ATTACKS with animation time here TimerManager.getInstance().schedule(() -> { map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); - map.damageMonster(attacker, monster, damage, (short) 0); + map.damageMonster(attacker, monster, damage); }, animationTime); } else { map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); - map.damageMonster(attacker, monster, damage, (short) 0); + map.damageMonster(attacker, monster, damage); } } diff --git a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java b/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java index 2007c8822e..6fdb98b197 100644 --- a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java +++ b/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java @@ -56,7 +56,7 @@ public class FieldDamageMobHandler extends AbstractPacketHandler { } map.broadcastMessage(chr, PacketCreator.damageMonster(mobOid, dmg), true); - map.damageMonster(chr, mob, dmg, (short) 0); + map.damageMonster(chr, mob, dmg); } } } diff --git a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java b/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java index 3b62ddcad4..c11063d539 100644 --- a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java +++ b/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java @@ -72,7 +72,7 @@ public final class MobDamageMobHandler extends AbstractPacketHandler { dmg = maxDmg; } - map.damageMonster(chr, damaged, dmg, (short) 0); + map.damageMonster(chr, damaged, dmg); map.broadcastMessage(chr, PacketCreator.damageMonster(to, dmg), false); } diff --git a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java index 837c8f357a..82045ac142 100644 --- a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java @@ -121,7 +121,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler { target.applyStatus(player, new MonsterStatusEffect(summonEffect.getMonsterStati(), summonSkill, null, false), summonEffect.isPoison(), 4000); } } - player.getMap().damageMonster(player, target, damage, (short) 0); + player.getMap().damageMonster(player, target, damage); } } diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index c8d2e0ddd9..5207307bfb 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -178,7 +178,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler { if (bouncedamage > attacker.getMaxHp() / 5) { bouncedamage = attacker.getMaxHp() / 5; } - map.damageMonster(chr, attacker, bouncedamage, (short) 0); + map.damageMonster(chr, attacker, bouncedamage); map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), true); chr.sendPacket(PacketCreator.showOwnBuffEffect(id, 5)); map.broadcastMessage(chr, PacketCreator.showBuffEffect(chr.getId(), id, 5), false); @@ -211,7 +211,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler { int bouncedamage = (int) (damage * (chr.getBuffedValue(BuffStat.POWERGUARD).doubleValue() / (attacker.isBoss() ? 200 : 100))); bouncedamage = Math.min(bouncedamage, attacker.getMaxHp() / 10); damage -= bouncedamage; - map.damageMonster(chr, attacker, bouncedamage, (short) 0); + map.damageMonster(chr, attacker, bouncedamage); map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), false, true); attacker.aggroMonsterDamage(chr, bouncedamage); } diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index f9f28d1363..32b3d7cea1 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -1339,11 +1339,9 @@ public class MapleMap { return count; } - /* TODO: start using once all erroneous damageMonster() callers have been fixed - public boolean damageMonster(final Character chr, final Monster monster, final int damage) { - damageMonster(chr, monster, damage, (short) 0); + public boolean damageMonster(Character chr, Monster monster, int damage) { + return damageMonster(chr, monster, damage, (short) 0); } - */ public boolean damageMonster(final Character chr, final Monster monster, final int damage, short delay) { if (monster.getId() == MobId.ZAKUM_1) {