Null check holograms (although they shouldn't be null in this locatio…

…n...)
CitizensDev · Jul 10, 2024 · ec51df2 · ec51df2
1 parent 8571f3e
commit ec51df2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -510,7 +510,7 @@ public enum ExecutionMode {
 
         @Override
         public String toString() {
-            return name().charAt(0) + name().substring(1).toLowerCase(Locale.US);
+            return name().charAt(0) + name().substring(1).toLowerCase(Locale.ROOT);
         }
     }
 

diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -786,7 +786,7 @@ public void render(NPC npc, Vector3d offset) {
                 spawnHologram(npc, offset);
                 spawnWaitTicks = 5;
             }
-            if (!hologram.isSpawned())
+            if (hologram == null || !hologram.isSpawned())
                 return;
             render0(npc, offset);
         }
@@ -837,7 +837,7 @@ public void updateText(NPC npc, String raw) {
     public static class TabCompletions implements CompletionsProvider {
         @Override
         public Collection<String> getCompletions(CommandContext args, CommandSender sender, NPC npc) {
-            if (args.length() > 1 && npc != null && LINE_ARGS.contains(args.getString(1).toLowerCase(Locale.US))) {
+            if (args.length() > 1 && npc != null && LINE_ARGS.contains(args.getString(1).toLowerCase(Locale.ROOT))) {
                 HologramTrait ht = npc.getOrAddTrait(HologramTrait.class);
                 return IntStream.range(0, ht.getLines().size()).mapToObj(Integer::toString)
                         .collect(Collectors.toList());