Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-22 12:29:59 +02:00
Code Issues Projects Releases Wiki Activity

Extra null check in sit trait

Browse Source
This commit is contained in:
fullwall 2024-09-27 23:06:33 +08:00
parent 0f701a3c40
commit e78499f6ca
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/java/net/citizensnpcs/trait/MountTrait.java
View File

@ -41,8 +41,9 @@ public class MountTrait extends Trait {
@Override @Override
public void onDespawn() { public void onDespawn() {
if (NMS.getVehicle(npc.getEntity()) != null) { if (currentMount != null) {
npc.getEntity().leaveVehicle(); npc.getEntity().leaveVehicle();
currentMount = null;
} }
} }
@ -51,11 +52,6 @@ public class MountTrait extends Trait {
onDespawn(); onDespawn();
} }
@Override
public void onSpawn() {
checkMounted();
}
@Override @Override
public void run() { public void run() {
if (!npc.isSpawned()) if (!npc.isSpawned())
@ -79,10 +75,7 @@ public class MountTrait extends Trait {
public void unmount() { public void unmount() {
if (currentMount == null) if (currentMount == null)
return; return;
if (NMS.getVehicle(npc.getEntity()) != null) { onDespawn();
npc.getEntity().leaveVehicle();
}
uuid = null; uuid = null;
currentMount = null;
} }
} }

2
main/src/main/java/net/citizensnpcs/trait/SitTrait.java
View File

@ -26,7 +26,7 @@ public class SitTrait extends Trait {
} }
public boolean isSitting() { public boolean isSitting() {
return sittingAt != null; return sittingAt != null && sittingAt.getWorld() != null;
} }
@Override @Override