Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Update Upstream (Folia)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Folia Changes :
PaperMC/Folia@d58fab2 Fix animal spawning issue
PaperMC/Folia@3843340 Fix command sender check
  • Loading branch information
Euphillya committed Nov 22, 2023
1 parent e42a912 commit 48014a6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 24 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = fr.euphilia.tenseimc
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2

foliaRef = 7aacf902b0fc917b2874a67f4ebc77077936355d
foliaRef = 3843340cba3aac68f5ab54bd8a0cafd2670a9458

org.gradle.caching=true
org.gradle.parallel=false
Expand Down
2 changes: 1 addition & 1 deletion patches/api/0005-More-API-Enchantment.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ index 8183f26545998e076ad93b4e28f3a3ff693d1032..6ecf3df3242fcce1a53d0cebd342a054
@@ -432,6 +432,15 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat
acceptingNew = false;
}

+ // TenseiMC start
+ /**
+ * New enchantments can be added. Please note that this must be run at startup.
Expand Down
22 changes: 0 additions & 22 deletions patches/server/0004-Folia-Pull-Request-Pending-validation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,3 @@ index 385d5bc08928dd990b690b926e174af86f178c64..b00b14e9369fb4ce7a9f3ff8cb770fc6
}
);
} else {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 92809ef69b80a69f83e61f9aa0d26e54402a6f80..21e63ca15f9ca775293f0010e5fff5149a976f19 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1001,7 +1001,7 @@ public final class CraftServer implements Server {
null,
1L
);
- } else if (sender instanceof ConsoleCommandSender console) {
+ } else if (sender instanceof ConsoleCommandSender || sender instanceof io.papermc.paper.commands.FeedbackForwardingSender) { // TenseiMC
io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
CraftServer.this.dispatchCommand(sender, commandLine);
});
@@ -1021,7 +1021,7 @@ public final class CraftServer implements Server {
// 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) { // TenseiMC
io.papermc.paper.threadedregions.RegionizedServer.ensureGlobalTickThread("Dispatching command async");
} else {
// huh?

0 comments on commit 48014a6

Please sign in to comment.