From 572ec0513771e28bd79c7b0066189b36d9c17eac Mon Sep 17 00:00:00 2001 From: Player Name Date: Fri, 31 Jul 2026 22:44:02 +0200 Subject: [PATCH] leftover issues --- .../item/equipment/special/SpearWallSpecialHandler.java | 2 +- .../item/equipment/special/SweepSpecialHandler.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java index 3abb1e50f..727c51767 100644 --- a/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java +++ b/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java @@ -74,7 +74,7 @@ public final class SpearWallSpecialHandler extends MeleeSwingHandler implements if (!multi) { return super.swing(entity, victim, state); } - List list = findMultihitTargets(entity.getLocation(), entity, CombatStyle.MELEE); + List list = findMultihitTargets(victim, entity, CombatStyle.MELEE); BattleState[] targets = new BattleState[list.size()]; int count = 0; for (Entity e : list) { diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java index 3d34735b8..40e7a79bc 100644 --- a/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java +++ b/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java @@ -10,8 +10,6 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; -import core.game.world.map.Direction; -import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; @@ -90,10 +88,6 @@ public final class SweepSpecialHandler extends MeleeSwingHandler implements Plug if (!entity.getProperties().isMultiZone() || !victim.getProperties().isMultiZone()) { return new BattleState[]{state}; } - Location vl = victim.getLocation(); - int x = vl.getX(); - int y = vl.getY(); - Direction dir = Direction.getDirection(x - entity.getLocation().getX(), y - entity.getLocation().getY()); List l = new ArrayList<>(20); l.add(new BattleState(entity, victim)); List list = findMultihitTargetsForDragonHalberd(victim, entity);