Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-16 20:31:30 +01:00
Code Issues Projects Releases Wiki Activity

Add setMountedOn to MountTrait

Browse Source
This commit is contained in:
fullwall 2021-08-15 14:40:11 +08:00
parent 5a554c5d42
commit ef1baf5679
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,13 +26,13 @@ public class MountTrait extends Trait {
super("mounttrait");
}
public void checkMount(Entity e) {
if (mountedOn != null && (e == null || !e.getUniqueId().equals(mountedOn))) {
NPC other = CitizensAPI.getNPCRegistry().getByUniqueId(mountedOn);
if (other != null && other.isSpawned()) {
NMS.mount(other.getEntity(), npc.getEntity());
triggered = true;
}
public void checkMounted(Entity mounted) {
if (mountedOn == null || (mounted != null && mounted.getUniqueId().equals(mountedOn)))
return;
NPC other = CitizensAPI.getNPCRegistry().getByUniqueId(mountedOn);
if (other != null && other.isSpawned()) {
NMS.mount(other.getEntity(), npc.getEntity());
triggered = true;
}
}
@ -42,15 +42,14 @@ public class MountTrait extends Trait {
@Override
public void onDespawn() {
Entity e = NMS.getVehicle(npc.getEntity());
if (e != null) {
if (NMS.getVehicle(npc.getEntity()) != null) {
npc.getEntity().leaveVehicle();
}
}
@Override
public void onSpawn() {
checkMount(null);
checkMounted(null);
}
@Override
@ -63,26 +62,29 @@ public class MountTrait extends Trait {
} catch (IllegalArgumentException e) {
mountedOn = null;
}
checkMount(null);
checkMounted(null);
}
Entity e = NMS.getVehicle(npc.getEntity());
if (e == null && !triggered) {
Entity vehicle = NMS.getVehicle(npc.getEntity());
if (vehicle == null && !triggered) {
mountedOn = null;
} else if (e instanceof NPCHolder) {
mountedOn = ((NPCHolder) e).getNPC().getUniqueId();
uuid = mountedOn.toString();
} else if (vehicle instanceof NPCHolder) {
setMountedOn(((NPCHolder) vehicle).getNPC().getUniqueId());
}
checkMount(e);
checkMounted(vehicle);
}
public void setMountedOn(UUID uuid) {
this.mountedOn = uuid;
this.uuid = uuid.toString();
}
public void unmount() {
if (mountedOn != null) {
Entity e = NMS.getVehicle(npc.getEntity());
if (e != null) {
npc.getEntity().leaveVehicle();
}
uuid = null;
mountedOn = null;
if (mountedOn == null)
return;
if (NMS.getVehicle(npc.getEntity()) != null) {
npc.getEntity().leaveVehicle();
}
uuid = null;
mountedOn = null;
}
}
}