Fix command sender check

PaperMC · Oct 21, 2023 · 480ce47 · 480ce47
1 parent 757cb09
commit 480ce47
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
@@ -21519,7 +21519,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 39d6c642918f59c00fcfbf6f192211879b5e5466..a4dc29b1ccaac3f8e5ea491c1fd3d25960c245fa 100644
+index 39d6c642918f59c00fcfbf6f192211879b5e5466..2b0194354bf83249c4a769d21337bbcfb166aba9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -309,7 +309,7 @@ public final class CraftServer implements Server {
@@ -21568,7 +21568,7 @@ index 39d6c642918f59c00fcfbf6f192211879b5e5466..a4dc29b1ccaac3f8e5ea491c1fd3d259
 + 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);
 + });
@@ -21588,7 +21588,7 @@ index 39d6c642918f59c00fcfbf6f192211879b5e5466..a4dc29b1ccaac3f8e5ea491c1fd3d259
 + // 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 a4dc29b1ccaac3f8e5ea491c1fd3d25960c245fa..a50a9ffda4875061fb8840873115119f334f0519 100644
+index 2b0194354bf83249c4a769d21337bbcfb166aba9..9a2b68070826c6f635e6815867c396672cffea26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1266,6 +1266,7 @@ public final class CraftServer implements Server {