From f7324831b8bbf84c725e17fc1a1cdbff2bd5bf0f Mon Sep 17 00:00:00 2001 From: MagicBot Date: Fri, 23 Oct 2026 15:51:41 -0400 Subject: [PATCH] Remove the NECROPET power target type No power uses it after DRU-066 moved to the Powers.cfg Pet type, and its area query (WorldGrid.getObjectsInRangePartialNecroPets) was an empty stub. The DB rows are aligned with sql/necro-pet-targeting.sql. Co-Authored-By: Claude Opus 5.5 --- src/engine/InterestManagement/WorldGrid.java | 5 ----- src/engine/gameManager/PowersManager.java | 6 ------ src/engine/powers/PowersBase.java | 8 -------- 3 files changed, 19 deletions(-) diff --git a/src/engine/InterestManagement/WorldGrid.java b/src/engine/InterestManagement/WorldGrid.java index e2427599..9ecf11d3 100644 --- a/src/engine/InterestManagement/WorldGrid.java +++ b/src/engine/InterestManagement/WorldGrid.java @@ -118,11 +118,6 @@ public class WorldGrid { return outbound; } - public static HashSet getObjectsInRangePartialNecroPets(Vector3fImmutable loc, double r) { - HashSet outbound = new HashSet<>(); - return outbound; - } - public static HashSet getObjectsInRangeContains(Vector3fImmutable loc, double r, int mask) { HashSet outbound = getObjectsInRangePartial(loc, r, mask); return outbound; diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index c196da99..2aa757a8 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -1609,9 +1609,6 @@ public enum PowersManager { //Pet only allTargets = WorldGrid.getObjectsInRangePartial( targetLoc, pb.getRadius(), MBServerStatics.MASK_PET); - else if (pb.targetNecroPet()) - allTargets = WorldGrid.getObjectsInRangePartialNecroPets( - targetLoc, pb.getRadius()); else allTargets = WorldGrid.getObjectsInRangePartial( targetLoc, pb.getRadius(), 0); @@ -1808,9 +1805,6 @@ public enum PowersManager { //Pet only allTargets = WorldGrid.getObjectsInRangePartial( targetLoc, pb.getRadius(), MBServerStatics.MASK_PET); - else if (pb.targetNecroPet()) - allTargets = WorldGrid.getObjectsInRangePartialNecroPets( - targetLoc, pb.getRadius()); else allTargets = WorldGrid.getObjectsInRangePartial( targetLoc, pb.getRadius(), 0); diff --git a/src/engine/powers/PowersBase.java b/src/engine/powers/PowersBase.java index 77fd431b..43f1f786 100644 --- a/src/engine/powers/PowersBase.java +++ b/src/engine/powers/PowersBase.java @@ -60,7 +60,6 @@ public class PowersBase { public boolean targetPlayer = false; public boolean targetMob = false; public boolean targetPet = false; - public boolean targetNecroPet = false; public boolean targetSelf = false; public boolean targetWeapon = false; public boolean targetCorpse = false; @@ -288,7 +287,6 @@ public class PowersBase { this.targetPlayer = false; this.targetMob = false; this.targetPet = false; - this.targetNecroPet = false; this.targetSelf = false; this.targetWeapon = false; this.targetCorpse = false; @@ -316,8 +314,6 @@ public class PowersBase { this.targetSelf = true; else if (targetType.equals("PET")) this.targetPet = true; - else if (targetType.equals("NECROPET")) - this.targetNecroPet = true; else if (targetType.equals("ARMOR")) this.targetArmor = true; else if (targetType.equals("WEAPON")) @@ -502,10 +498,6 @@ public class PowersBase { return this.targetPet; } - public boolean targetNecroPet() { - return this.targetNecroPet; - } - public boolean targetSelf() { return this.targetSelf; }