Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-25 02:27:41 +01:00
Code Issues Projects Releases Wiki Activity

Don't teleport if despawned

Browse Source
This commit is contained in:
fullwall 2020-07-15 23:50:48 +08:00
parent 0036c9d6a2
commit 57373a68a3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -326,6 +326,8 @@ public class CitizensNPC extends AbstractNPC {
@Override @Override
public void teleport(Location location, TeleportCause reason) { public void teleport(Location location, TeleportCause reason) {
super.teleport(location, reason); super.teleport(location, reason);
if (!isSpawned())
return;
Location npcLoc = getEntity().getLocation(CACHE_LOCATION); Location npcLoc = getEntity().getLocation(CACHE_LOCATION);
if (isSpawned() && npcLoc.getWorld() == location.getWorld() && npcLoc.distanceSquared(location) < 1) { if (isSpawned() && npcLoc.getWorld() == location.getWorld() && npcLoc.distanceSquared(location) < 1) {
NMS.setHeadYaw(getEntity(), location.getYaw()); NMS.setHeadYaw(getEntity(), location.getYaw());