mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2024-10-22 12:29:59 +02:00
Extra null check in sit trait
This commit is contained in:
parent
0f701a3c40
commit
e78499f6ca
@ -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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user