Merge pull request CommandAPI#580 from Mrredstone5230/fix/nullcommandsender-exception

Made NullCommandSender not throw an exception on Paper

Author: willkroboth

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkit.java

@@ -409,6 +409,13 @@ public BukkitCommandSender<? extends CommandSender> wrapCommandSender(CommandSen
 				// We literally cannot type this at compile-time, so let's use a placeholder CommandSender instance
 				return new BukkitFeedbackForwardingCommandSender<CommandSender>(FeedbackForwardingSender.cast(sender));
 			}
+
+			final Class<? extends CommandSender> NullCommandSender = paper.getNullCommandSender();
+			if (NullCommandSender != null && NullCommandSender.isInstance(sender)) {
+				// Since this should only be during a function load, this is just a placeholder to evade the exception.
+				return null;
+			}
+
 		}
 		throw new RuntimeException("Failed to wrap CommandSender " + sender + " to a CommandAPI-compatible BukkitCommandSender");
 	}

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/PaperImplementations.java

@@ -22,6 +22,7 @@ public class PaperImplementations {
 	private final boolean isFoliaPresent;
 	private final NMS<?> nmsInstance;
 	private final Class<? extends CommandSender> feedbackForwardingCommandSender;
+	private final Class<? extends CommandSender> nullCommandSender;
 
 	/**
 	 * Constructs a PaperImplementations object
@@ -44,6 +45,15 @@ public PaperImplementations(boolean isPaperPresent, boolean isFoliaPresent, NMS<
 		}
 
 		this.feedbackForwardingCommandSender = tempFeedbackForwardingCommandSender;
+
+		Class<? extends CommandSender> tempNullCommandSender = null;
+		try {
+			tempNullCommandSender = (Class<? extends CommandSender>) Class.forName("io.papermc.paper.brigadier.NullCommandSender");
+		} catch (ClassNotFoundException e) {
+			// uhh...
+		}
+
+		this.nullCommandSender = tempNullCommandSender;
 	}
 
 	/**
@@ -115,6 +125,13 @@ public Class<? extends CommandSender> getFeedbackForwardingCommandSender() {
 		return this.feedbackForwardingCommandSender;
 	}
 
+	/**
+	 * @return a class reference pointing to {@code io.papermc.paper.brigadier.NullCommandSender}
+	 */
+	public Class<? extends CommandSender> getNullCommandSender() {
+		return this.nullCommandSender;
+	}
+
 	/**
 	 * Builds a {@link WrapperCommandSyntaxException} from a message with colour codes like {@link ChatColor} or using the § symbol.
 	 *