MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Merge branch 'magicbox1.5' into feature-guard-patrol

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-05-09 18:40:04 -05:00
parent 76f3d2599b 7168813ba5
commit b3c7db9214
10 changed files with 48 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/devcmd/cmds/RemoveObjectCmd.java
+11 -2
View File
@@ -204,7 +204,10 @@ public class RemoveObjectCmd extends AbstractDevCmd {
return;
}
// Remove npc from hirelings list.
if (npc.building != null)
npc.building.getHirelings().remove(npc);
for (Mob mob : npc.getSiegeMinionMap().keySet()) {
WorldGrid.RemoveWorldObject(mob);
@@ -225,6 +228,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
private void removeMob(PlayerCharacter pc, Mob mob) {
Zone currentZone = ZoneManager.findSmallestZone(pc.getLoc());
if (currentZone == null) {
this.throwbackError(pc, "Could not locate zone for player.");
return;
@@ -235,8 +239,13 @@ public class RemoveObjectCmd extends AbstractDevCmd {
return;
}
mob.setLoc(Vector3fImmutable.ZERO); //Move it off the plane..
mob.setBindLoc(Vector3fImmutable.ZERO); //Reset the bind loc..
// Remove npc from hirelings list.
if (mob.building != null)
mob.building.getHirelings().remove(mob);
mob.setLoc(Vector3fImmutable.ZERO); //Move it off the plane..
mob.setBindLoc(Vector3fImmutable.ZERO); //Reset the bind loc..
//mob.setHealth(-1, pc); //Kill it!
DbManager.MobQueries.DELETE_MOB(mob);