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

Actually this is in a sync context so just null check is fine

Browse Source
This commit is contained in:
fullwall 2024-08-19 15:10:26 +08:00
parent d0f7ba7695
commit 6bfb2a0dd7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
View File

@ -622,7 +622,7 @@ public class HologramTrait extends Trait {
} }
public static class InteractionVehicleRenderer extends SingleEntityHologramRenderer { public static class InteractionVehicleRenderer extends SingleEntityHologramRenderer {
private volatile Vector3d lastOffset; private Vector3d lastOffset;
@Override @Override
protected NPC createNPC(Entity base, String name, Vector3d offset) { protected NPC createNPC(Entity base, String name, Vector3d offset) {
@ -632,7 +632,7 @@ public class HologramTrait extends Trait {
@Override @Override
public void onSeenByPlayer(NPC npc, Player player) { public void onSeenByPlayer(NPC npc, Player player) {
if (lastOffset == null) if (lastOffset == null || hologram == null)
return; return;
NMS.positionInteractionText(player, hologram.getEntity(), npc.getEntity(), lastOffset.y); NMS.positionInteractionText(player, hologram.getEntity(), npc.getEntity(), lastOffset.y);
} }
@ -746,11 +746,11 @@ public class HologramTrait extends Trait {
*/ */
// TODO: make view range part of hologram renderer? // TODO: make view range part of hologram renderer?
public abstract static class SingleEntityHologramRenderer implements HologramRenderer { public abstract static class SingleEntityHologramRenderer implements HologramRenderer {
protected volatile NPC hologram; protected NPC hologram;
private NPCRegistry registry; private NPCRegistry registry;
private int spawnWaitTicks; private int spawnWaitTicks;
protected String text; protected String text;
protected int viewRange = -1; private int viewRange = -1;
protected abstract NPC createNPC(Entity base, String text, Vector3d offset); protected abstract NPC createNPC(Entity base, String text, Vector3d offset);