Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-23 11:05:49 +01:00
Code Issues Projects Releases Wiki Activity

Fire NPCTeleportEvent in all cases to allow cancelling

Browse Source
This commit is contained in:
fullwall 2021-04-13 12:06:22 +08:00
parent eb4262a80f
commit 979d6f95fa
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -64,6 +64,7 @@ import net.citizensnpcs.api.command.exception.ServerCommandException;
import net.citizensnpcs.api.event.CommandSenderCloneNPCEvent; import net.citizensnpcs.api.event.CommandSenderCloneNPCEvent;
import net.citizensnpcs.api.event.CommandSenderCreateNPCEvent; import net.citizensnpcs.api.event.CommandSenderCreateNPCEvent;
import net.citizensnpcs.api.event.DespawnReason; import net.citizensnpcs.api.event.DespawnReason;
import net.citizensnpcs.api.event.NPCTeleportEvent;
import net.citizensnpcs.api.event.PlayerCloneNPCEvent; import net.citizensnpcs.api.event.PlayerCloneNPCEvent;
import net.citizensnpcs.api.event.PlayerCreateNPCEvent; import net.citizensnpcs.api.event.PlayerCreateNPCEvent;
import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.event.SpawnReason;
@ -2305,6 +2306,10 @@ public class NPCCommands {
to.setZ(to.getZ() + 0.5); to.setZ(to.getZ() + 0.5);
} }
if (!npc.isSpawned()) { if (!npc.isSpawned()) {
NPCTeleportEvent event = new NPCTeleportEvent(npc, to);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled())
return;
npc.spawn(to, SpawnReason.COMMAND); npc.spawn(to, SpawnReason.COMMAND);
} else { } else {
npc.teleport(to, TeleportCause.COMMAND); npc.teleport(to, TeleportCause.COMMAND);