Make use of original spawn location for deletion and info.

This commit is contained in:
MobiusDevelopment
2022-08-12 23:03:47 +00:00
parent 35e9f2dd5a
commit 569faf521d
59 changed files with 238 additions and 171 deletions

View File

@@ -111,7 +111,8 @@ public class NpcActionShift implements IActionShiftHandler
else
{
html.replace("%spawntype%", "Fixed");
html.replace("%spawn%", ((Npc) target).getSpawn().getX() + " " + ((Npc) target).getSpawn().getY() + " " + ((Npc) target).getSpawn().getZ());
final Location spawnLoc = ((Npc) target).getSpawn().getSpawnLocation() != null ? ((Npc) target).getSpawn().getSpawnLocation() : ((Npc) target).getSpawn();
html.replace("%spawn%", spawnLoc.getX() + " " + spawnLoc.getY() + " " + spawnLoc.getZ());
}
if (((Npc) target).getSpawn().getRespawnMinDelay() == 0)
{