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 <noreply@anthropic.com>
This commit is contained in:
1 parent
fe5c69cc09
commit
f7324831b8
3 files changed
-19
No files matched your search
@@ -118,11 +118,6 @@ public class WorldGrid {
|
|||||||
return outbound;
|
return outbound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static HashSet<AbstractWorldObject> getObjectsInRangePartialNecroPets(Vector3fImmutable loc, double r) {
|
|
||||||
HashSet<AbstractWorldObject> outbound = new HashSet<>();
|
|
||||||
return outbound;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static HashSet<AbstractWorldObject> getObjectsInRangeContains(Vector3fImmutable loc, double r, int mask) {
|
public static HashSet<AbstractWorldObject> getObjectsInRangeContains(Vector3fImmutable loc, double r, int mask) {
|
||||||
HashSet<AbstractWorldObject> outbound = getObjectsInRangePartial(loc, r, mask);
|
HashSet<AbstractWorldObject> outbound = getObjectsInRangePartial(loc, r, mask);
|
||||||
return outbound;
|
return outbound;
|
||||||
|
|||||||
@@ -1609,9 +1609,6 @@ public enum PowersManager {
|
|||||||
//Pet only
|
//Pet only
|
||||||
allTargets = WorldGrid.getObjectsInRangePartial(
|
allTargets = WorldGrid.getObjectsInRangePartial(
|
||||||
targetLoc, pb.getRadius(), MBServerStatics.MASK_PET);
|
targetLoc, pb.getRadius(), MBServerStatics.MASK_PET);
|
||||||
else if (pb.targetNecroPet())
|
|
||||||
allTargets = WorldGrid.getObjectsInRangePartialNecroPets(
|
|
||||||
targetLoc, pb.getRadius());
|
|
||||||
else
|
else
|
||||||
allTargets = WorldGrid.getObjectsInRangePartial(
|
allTargets = WorldGrid.getObjectsInRangePartial(
|
||||||
targetLoc, pb.getRadius(), 0);
|
targetLoc, pb.getRadius(), 0);
|
||||||
@@ -1808,9 +1805,6 @@ public enum PowersManager {
|
|||||||
//Pet only
|
//Pet only
|
||||||
allTargets = WorldGrid.getObjectsInRangePartial(
|
allTargets = WorldGrid.getObjectsInRangePartial(
|
||||||
targetLoc, pb.getRadius(), MBServerStatics.MASK_PET);
|
targetLoc, pb.getRadius(), MBServerStatics.MASK_PET);
|
||||||
else if (pb.targetNecroPet())
|
|
||||||
allTargets = WorldGrid.getObjectsInRangePartialNecroPets(
|
|
||||||
targetLoc, pb.getRadius());
|
|
||||||
else
|
else
|
||||||
allTargets = WorldGrid.getObjectsInRangePartial(
|
allTargets = WorldGrid.getObjectsInRangePartial(
|
||||||
targetLoc, pb.getRadius(), 0);
|
targetLoc, pb.getRadius(), 0);
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ public class PowersBase {
|
|||||||
public boolean targetPlayer = false;
|
public boolean targetPlayer = false;
|
||||||
public boolean targetMob = false;
|
public boolean targetMob = false;
|
||||||
public boolean targetPet = false;
|
public boolean targetPet = false;
|
||||||
public boolean targetNecroPet = false;
|
|
||||||
public boolean targetSelf = false;
|
public boolean targetSelf = false;
|
||||||
public boolean targetWeapon = false;
|
public boolean targetWeapon = false;
|
||||||
public boolean targetCorpse = false;
|
public boolean targetCorpse = false;
|
||||||
@@ -288,7 +287,6 @@ public class PowersBase {
|
|||||||
this.targetPlayer = false;
|
this.targetPlayer = false;
|
||||||
this.targetMob = false;
|
this.targetMob = false;
|
||||||
this.targetPet = false;
|
this.targetPet = false;
|
||||||
this.targetNecroPet = false;
|
|
||||||
this.targetSelf = false;
|
this.targetSelf = false;
|
||||||
this.targetWeapon = false;
|
this.targetWeapon = false;
|
||||||
this.targetCorpse = false;
|
this.targetCorpse = false;
|
||||||
@@ -316,8 +314,6 @@ public class PowersBase {
|
|||||||
this.targetSelf = true;
|
this.targetSelf = true;
|
||||||
else if (targetType.equals("PET"))
|
else if (targetType.equals("PET"))
|
||||||
this.targetPet = true;
|
this.targetPet = true;
|
||||||
else if (targetType.equals("NECROPET"))
|
|
||||||
this.targetNecroPet = true;
|
|
||||||
else if (targetType.equals("ARMOR"))
|
else if (targetType.equals("ARMOR"))
|
||||||
this.targetArmor = true;
|
this.targetArmor = true;
|
||||||
else if (targetType.equals("WEAPON"))
|
else if (targetType.equals("WEAPON"))
|
||||||
@@ -502,10 +498,6 @@ public class PowersBase {
|
|||||||
return this.targetPet;
|
return this.targetPet;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean targetNecroPet() {
|
|
||||||
return this.targetNecroPet;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean targetSelf() {
|
public boolean targetSelf() {
|
||||||
return this.targetSelf;
|
return this.targetSelf;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user