Fix command sender check

PaperMC · Nov 21, 2023 · 3843340 · 3843340
1 parent d58fab2
commit 3843340
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/patches/server/0003-Threaded-Regions.patch b/patches/server/0003-Threaded-Regions.patch
@@ -21666,7 +21666,7 @@ index 1d7c663fa0e550bd0cfb9a4b83ccd7e2968666f0..f3df9c9b6cff85565514f990597f3fe5
  LevelChunkTicks<T> levelChunkTicks = this.allContainers.get(l);
  if (levelChunkTicks == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..7ced957b11deb6643bff6547257f449c56038d74 100644
+index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..541915675dd3ad832992360283e3ba1b3cc62e27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -311,7 +311,7 @@ public final class CraftServer implements Server {
@@ -21715,7 +21715,7 @@ index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..7ced957b11deb6643bff6547257f449c
 + null,
 + 1L
 + );
-+ } else if (sender instanceof ConsoleCommandSender console) {
++ } else if (sender instanceof ConsoleCommandSender || sender instanceof io.papermc.paper.commands.FeedbackForwardingSender) {
 + io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
 + CraftServer.this.dispatchCommand(sender, commandLine);
 + });
@@ -21735,7 +21735,7 @@ index bbc51ebf0dc0801ace9d5e7875fb2fe100b286bc..7ced957b11deb6643bff6547257f449c
 + // Folia start - region threading
 + if ((sender instanceof Entity entity)) {
 + io.papermc.paper.util.TickThread.ensureTickThread(((org.bukkit.craftbukkit.entity.CraftEntity)entity).getHandle(), "Dispatching command async");
-+ } else if (sender instanceof ConsoleCommandSender console) {
++ } else if (sender instanceof ConsoleCommandSender || sender instanceof io.papermc.paper.commands.FeedbackForwardingSender) {
 + io.papermc.paper.threadedregions.RegionizedServer.ensureGlobalTickThread("Dispatching command async");
 + } else {
 + // huh?

diff --git a/patches/server/0008-Throw-UnsupportedOperationException-for-broken-APIs.patch b/patches/server/0008-Throw-UnsupportedOperationException-for-broken-APIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Throw UnsupportedOperationException() for broken APIs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7ced957b11deb6643bff6547257f449c56038d74..4b43134f38ba203a309a412055461b57934da8f9 100644
+index 541915675dd3ad832992360283e3ba1b3cc62e27..bc778637c7d4371cafa9bcda67f8965f57cc66d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1268,6 +1268,7 @@ public final class CraftServer implements Server {