Overload damageMonster for when no delay is needed

P0nk · Aug 17, 2024 · 2d40a89 · 2d40a89
1 parent 802cc2b
commit 2d40a89
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git 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 void execute(Client c, String[] params) {
  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
@@ -591,11 +591,11 @@ private static void damageMonsterWithSkill(final Character attacker, final Maple
  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
@@ -56,7 +56,7 @@ public final void handlePacket(InPacket p, Client c) {
  }
 
  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
@@ -72,7 +72,7 @@ public void handlePacket(InPacket p, Client c) {
  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
@@ -121,7 +121,7 @@ public void handlePacket(InPacket p, Client c) {
  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
@@ -178,7 +178,7 @@ public void handlePacket(InPacket p, Client c) {
  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 void handlePacket(InPacket p, Client c) {
  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
@@ -1339,11 +1339,9 @@ public int countBosses() {
  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) {