From ccf155d5008def64ff3efaa8439fb1c10a4dc6f9 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Sat, 2 Mar 2024 21:51:49 +0100 Subject: [PATCH] Fixed flag static init order leading to null pointer exeption --- .../steamwar/bausystem/features/tracer/TraceCommand.java | 4 ++-- .../bausystem/features/tracer/rendering/ViewFlag.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java index 95954c98..f048e1be 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java @@ -34,6 +34,7 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.stream.Collectors; @Linked @@ -111,11 +112,10 @@ public class TraceCommand extends SWCommand { } return null; } - @Override public Collection tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) { return ViewFlag.flags.stream() - .map(viewFlag -> viewFlag.name) + .map(flag -> flag.name) .map(name -> "--" + name) .collect(Collectors.toList()); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java index d2a2c2bc..bc838b5d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java @@ -30,6 +30,10 @@ import java.util.function.UnaryOperator; import java.util.stream.Collectors; public abstract class ViewFlag { + /** + * Static registry of static flags + */ + public static final List flags = new ArrayList<>(); public static ViewFlag EXPLOSION = new ViewFlag(true,"explosion") { @Override @@ -53,11 +57,6 @@ public abstract class ViewFlag { */ public final String[] aliases; - /** - * Static registry of static flags - */ - public static final List flags = new ArrayList<>(); - public ViewFlag(boolean isStatic, String name, String... aliases) { this.name = name; this.aliases = aliases;