From c57fee5b86aecc8dc7904b6777f24bb6507ed419 Mon Sep 17 00:00:00 2001
From: Phillipp Glanz
Date: Fri, 12 May 2023 13:12:08 +0200
Subject: [PATCH] Fixes command context for bukkit console command sender
(#2193)
---
.../java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java | 6 +++++-
.../worldedit/command/util/annotation/ConfirmHandler.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
index 876517dd6..f1edf65f7 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -112,11 +112,15 @@ public class WorldEditPlugin extends JavaPlugin {
private BukkitServerInterface platform;
private BukkitConfiguration config;
private BukkitPermissionAttachmentManager permissionAttachmentManager;
+ // Fawe start
+ private BukkitCommandSender bukkitConsoleCommandSender;
+ // Fawe end
@Override
public void onLoad() {
//FAWE start
+ this.bukkitConsoleCommandSender = new BukkitCommandSender(this, Bukkit.getConsoleSender());
// This is already covered by Spigot, however, a more pesky warning with a proper explanation over "Ambiguous plugin name..." can't hurt.
Plugin[] plugins = Bukkit.getServer().getPluginManager().getPlugins();
for (Plugin p : plugins) {
@@ -594,7 +598,7 @@ public class WorldEditPlugin extends JavaPlugin {
return new BukkitBlockCommandSender(this, (BlockCommandSender) sender);
}
- return new BukkitCommandSender(this, sender);
+ return bukkitConsoleCommandSender;
}
public BukkitServerInterface getInternalPlatform() {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/ConfirmHandler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/ConfirmHandler.java
index 5bf1ccc6c..067f9cfeb 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/ConfirmHandler.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/ConfirmHandler.java
@@ -24,7 +24,7 @@ public class ConfirmHandler implements CommandCallListener {
}
Optional actorOpt = parameters.injectedValue(Key.of(Actor.class));
- if (!actorOpt.isPresent()) {
+ if (actorOpt.isEmpty()) {
return;
}
Actor actor = actorOpt.get();