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

Null check holograms (although they shouldn't be null in this location...)

Browse Source
This commit is contained in:
fullwall 2024-07-10 10:04:31 +08:00
parent 8571f3e163
commit ec51df24b5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,7 +510,7 @@ public class CommandTrait extends Trait {
@Override @Override
public String toString() { public String toString() {
return name().charAt(0) + name().substring(1).toLowerCase(Locale.US); return name().charAt(0) + name().substring(1).toLowerCase(Locale.ROOT);
} }
} }

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

@ -786,7 +786,7 @@ public class HologramTrait extends Trait {
spawnHologram(npc, offset); spawnHologram(npc, offset);
spawnWaitTicks = 5; spawnWaitTicks = 5;
} }
if (!hologram.isSpawned()) if (hologram == null || !hologram.isSpawned())
return; return;
render0(npc, offset); render0(npc, offset);
} }
@ -837,7 +837,7 @@ public class HologramTrait extends Trait {
public static class TabCompletions implements CompletionsProvider { public static class TabCompletions implements CompletionsProvider {
@Override @Override
public Collection<String> getCompletions(CommandContext args, CommandSender sender, NPC npc) { 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); HologramTrait ht = npc.getOrAddTrait(HologramTrait.class);
return IntStream.range(0, ht.getLines().size()).mapToObj(Integer::toString) return IntStream.range(0, ht.getLines().size()).mapToObj(Integer::toString)
.collect(Collectors.toList()); .collect(Collectors.toList());