Fix fabric and probably forge,neoforge throwing an NPE when a player joins. Fixes: #761

Author: TBlueF

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java

@@ -77,15 +77,15 @@ public boolean hasPermission(String permission) {
     public Optional<Vector3d> getPosition() {
         if (!delegate.isExecutedByPlayer() && delegate.getName().equals("Server")) return Optional.empty();
 
-        Vec3d pos = delegate.getPosition();
-        return Optional.of(new Vector3d(pos.x, pos.y, pos.z));
+        return Optional.ofNullable(delegate.getPosition())
+                .map(pos -> new Vector3d(pos.x, pos.y, pos.z));
     }
 
     @Override
     public Optional<ServerWorld> getWorld() {
         if (!delegate.isExecutedByPlayer() && delegate.getName().equals("Server")) return Optional.empty();
 
-        return Optional.of(delegate.getWorld())
+        return Optional.ofNullable(delegate.getWorld())
                 .map(mod::getServerWorld);
     }
 

implementations/forge/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java

@@ -68,15 +68,17 @@ public boolean hasPermission(String permission) {
     public Optional<Vector3d> getPosition() {
         if (!delegate.isPlayer() && delegate.getTextName().equals("Server")) return Optional.empty();
 
-        var pos = delegate.getPosition();
-        return Optional.of(new Vector3d(pos.x, pos.y, pos.z));
+        //noinspection OptionalOfNullableMisuse
+        return Optional.ofNullable(delegate.getPosition())
+                .map(pos -> new Vector3d(pos.x, pos.y, pos.z));
     }
 
     @Override
     public Optional<ServerWorld> getWorld() {
         if (!delegate.isPlayer() && delegate.getTextName().equals("Server")) return Optional.empty();
 
-        return Optional.of(delegate.getLevel())
+        //noinspection OptionalOfNullableMisuse
+        return Optional.ofNullable(delegate.getLevel())
                 .map(mod::getServerWorld);
     }
 

implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java

@@ -69,15 +69,17 @@ public boolean hasPermission(String permission) {
     public Optional<Vector3d> getPosition() {
         if (!delegate.isPlayer() && delegate.getTextName().equals("Server")) return Optional.empty();
 
-        var pos = delegate.getPosition();
-        return Optional.of(new Vector3d(pos.x, pos.y, pos.z));
+        //noinspection OptionalOfNullableMisuse
+        return Optional.ofNullable(delegate.getPosition())
+                .map(pos -> new Vector3d(pos.x, pos.y, pos.z));
     }
 
     @Override
     public Optional<ServerWorld> getWorld() {
         if (!delegate.isPlayer() && delegate.getTextName().equals("Server")) return Optional.empty();
 
-        return Optional.of(delegate.getLevel())
+        //noinspection OptionalOfNullableMisuse
+        return Optional.ofNullable(delegate.getLevel())
                 .map(mod::getServerWorld);
     }
 

implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommandSource.java

@@ -27,6 +27,7 @@
 import com.flowpowered.math.vector.Vector3d;
 import de.bluecolored.bluemap.common.serverinterface.CommandSource;
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
+import de.bluecolored.bluemap.core.logger.Logger;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Location;

implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java

@@ -26,6 +26,7 @@
 
 import com.destroystokyo.paper.event.player.PlayerPostRespawnEvent;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.mojang.brigadier.tree.LiteralCommandNode;
 import de.bluecolored.bluecommands.brigadier.BrigadierBridge;
 import de.bluecolored.bluemap.common.commands.BrigadierExecutionHandler;
 import de.bluecolored.bluemap.common.commands.Commands;
@@ -39,6 +40,7 @@
 import de.bluecolored.bluemap.core.util.Caches;
 import de.bluecolored.bluemap.core.util.Key;
 import io.papermc.paper.ServerBuildInfo;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
 import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 import org.bstats.bukkit.Metrics;
@@ -109,12 +111,17 @@ public void onEnable() {
         //noinspection UnstableApiUsage
         this.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> {
 
-            //noinspection UnstableApiUsage
             BrigadierBridge.createCommandNodes(
                     Commands.create(pluginInstance),
                     new BrigadierExecutionHandler(pluginInstance),
                     BukkitCommandSource::new
-            ).forEach(commands.registrar().getDispatcher().getRoot()::addChild);
+            ).forEach(command -> {
+                //noinspection UnstableApiUsage
+                if (command instanceof LiteralCommandNode<CommandSourceStack> literal) {
+                    //noinspection UnstableApiUsage
+                    commands.registrar().register(literal);
+                }
+            });
 
         });
 

implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongeCommands.java

@@ -102,10 +102,6 @@ public List<CommandCompletion> complete(CommandCause cause, ArgumentReader.Mutab
             String input = label + " " + arguments.input();
             int position = input.lastIndexOf(' ') + 1;
 
-            //noinspection resource
-            InputReader inputReader = new InputReader(input);
-            inputReader.setPosition(position);
-
             SpongeCommandSource context = new SpongeCommandSource(cause.audience(), cause.subject());
             ParseResult<CommandSource, Object> result = commands.parse(context, input);