Fire NPCTeleportEvent in all cases to allow cancelling

CitizensDev · Apr 13, 2021 · 979d6f9 · 979d6f9
1 parent eb4262a
commit 979d6f9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -64,6 +64,7 @@
 import net.citizensnpcs.api.event.CommandSenderCloneNPCEvent;
 import net.citizensnpcs.api.event.CommandSenderCreateNPCEvent;
 import net.citizensnpcs.api.event.DespawnReason;
+import net.citizensnpcs.api.event.NPCTeleportEvent;
 import net.citizensnpcs.api.event.PlayerCloneNPCEvent;
 import net.citizensnpcs.api.event.PlayerCreateNPCEvent;
 import net.citizensnpcs.api.event.SpawnReason;
@@ -2305,6 +2306,10 @@ public void tphere(CommandContext args, CommandSender sender, NPC npc) throws Co
             to.setZ(to.getZ() + 0.5);
         }
         if (!npc.isSpawned()) {
+            NPCTeleportEvent event = new NPCTeleportEvent(npc, to);
+            Bukkit.getPluginManager().callEvent(event);
+            if (event.isCancelled())
+                return;
             npc.spawn(to, SpawnReason.COMMAND);
         } else {
             npc.teleport(to, TeleportCause.COMMAND);