Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Overload damageMonster for when no delay is needed

Browse Source
This commit is contained in:
P0nk
2024-08-17 18:51:50 +02:00
parent 802cc2b5f5
commit 2d40a89c55
7 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/client/command/commands/gm3/KillAllCommand.java
View File

@@ -49,7 +49,7 @@ public class KillAllCommand extends Command {
for (MapObject monstermo : monsters) { for (MapObject monstermo : monsters) {
Monster monster = (Monster) monstermo; Monster monster = (Monster) monstermo;
if (!monster.getStats().isFriendly() && !(monster.getId() >= MobId.DEAD_HORNTAIL_MIN && monster.getId() <= MobId.HORNTAIL)) { 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++; count++;
} }
} }

4
src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -591,11 +591,11 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
if (animationTime > 0) { // be sure to only use LIMITED ATTACKS with animation time here if (animationTime > 0) { // be sure to only use LIMITED ATTACKS with animation time here
TimerManager.getInstance().schedule(() -> { TimerManager.getInstance().schedule(() -> {
map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition());
map.damageMonster(attacker, monster, damage, (short) 0); map.damageMonster(attacker, monster, damage);
}, animationTime); }, animationTime);
} else { } else {
map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition()); map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition());
map.damageMonster(attacker, monster, damage, (short) 0); map.damageMonster(attacker, monster, damage);
} }
} }

2
src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java
View File

@@ -56,7 +56,7 @@ public class FieldDamageMobHandler extends AbstractPacketHandler {
} }
map.broadcastMessage(chr, PacketCreator.damageMonster(mobOid, dmg), true); map.broadcastMessage(chr, PacketCreator.damageMonster(mobOid, dmg), true);
map.damageMonster(chr, mob, dmg, (short) 0); map.damageMonster(chr, mob, dmg);
} }
} }
} }

2
src/main/java/net/server/channel/handlers/MobDamageMobHandler.java
View File

@@ -72,7 +72,7 @@ public final class MobDamageMobHandler extends AbstractPacketHandler {
dmg = maxDmg; dmg = maxDmg;
} }
map.damageMonster(chr, damaged, dmg, (short) 0); map.damageMonster(chr, damaged, dmg);
map.broadcastMessage(chr, PacketCreator.damageMonster(to, dmg), false); map.broadcastMessage(chr, PacketCreator.damageMonster(to, dmg), false);
} }

2
src/main/java/net/server/channel/handlers/SummonDamageHandler.java
View File

@@ -121,7 +121,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
target.applyStatus(player, new MonsterStatusEffect(summonEffect.getMonsterStati(), summonSkill, null, false), summonEffect.isPoison(), 4000); 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);
} }
} }

4
src/main/java/net/server/channel/handlers/TakeDamageHandler.java
View File

@@ -178,7 +178,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler {
if (bouncedamage > attacker.getMaxHp() / 5) { if (bouncedamage > attacker.getMaxHp() / 5) {
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); map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), true);
chr.sendPacket(PacketCreator.showOwnBuffEffect(id, 5)); chr.sendPacket(PacketCreator.showOwnBuffEffect(id, 5));
map.broadcastMessage(chr, PacketCreator.showBuffEffect(chr.getId(), id, 5), false); 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))); int bouncedamage = (int) (damage * (chr.getBuffedValue(BuffStat.POWERGUARD).doubleValue() / (attacker.isBoss() ? 200 : 100)));
bouncedamage = Math.min(bouncedamage, attacker.getMaxHp() / 10); bouncedamage = Math.min(bouncedamage, attacker.getMaxHp() / 10);
damage -= bouncedamage; damage -= bouncedamage;
map.damageMonster(chr, attacker, bouncedamage, (short) 0); map.damageMonster(chr, attacker, bouncedamage);
map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), false, true); map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), false, true);
attacker.aggroMonsterDamage(chr, bouncedamage); attacker.aggroMonsterDamage(chr, bouncedamage);
} }

6
src/main/java/server/maps/MapleMap.java
View File

@@ -1339,11 +1339,9 @@ public class MapleMap {
return count; return count;
} }
/* TODO: start using once all erroneous damageMonster() callers have been fixed public boolean damageMonster(Character chr, Monster monster, int damage) {
public boolean damageMonster(final Character chr, final Monster monster, final int damage) { return damageMonster(chr, monster, damage, (short) 0);
damageMonster(chr, monster, damage, (short) 0);
} }
*/
public boolean damageMonster(final Character chr, final Monster monster, final int damage, short delay) { public boolean damageMonster(final Character chr, final Monster monster, final int damage, short delay) {
if (monster.getId() == MobId.ZAKUM_1) { if (monster.getId() == MobId.ZAKUM_1) {