Updated Upstream(Folia) & Drop Frustum filtering tracker patch
Shiroha CI / build (push) Canceled after 0s
Shiroha CI / Event File (push) Canceled after 0s

This commit is contained in:
2026-08-08 11:46:48 +08:00
parent d1786e96ef
commit c736416ca5
50 changed files with 138 additions and 195 deletions
@@ -5,7 +5,7 @@ Subject: [PATCH] Force disable reload command and api
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9d0dc8815842a0583b212891680bd0c6461c30b9..fc789b5a4376db133558e698c65daddd9d8a4bd9 100644
index 3fac32b420ce4ae74166eac43d38c51c1fd513cf..2ddb8d343c58e9005058dd50bfc6490b14402bed 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -981,6 +981,7 @@ public final class CraftServer implements Server {
@@ -18,7 +18,7 @@ index 9661f033bbb2c00073f1c891e1411c2a9943a37a..7ad9d8d4346781c928b93a45833b6570
return;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fc789b5a4376db133558e698c65daddd9d8a4bd9..bec12eb481d305659c48205fe30677baba6fd091 100644
index 2ddb8d343c58e9005058dd50bfc6490b14402bed..774997f11c8b50287c10e48c01278c4d995aae45 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -302,7 +302,7 @@ public final class CraftServer implements Server {
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to disable async catchers
diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java b/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java
index 6c74787321748702022787b65ff5465f8bcec4ad..bc77aa74fb21300d8b1c00723f0e30931caba54a 100644
index 72a3478a98912caae8899df37218dd2a628a6e05..9c108fd09b0eeec22206cdec4ca861d0a35a5015 100644
--- a/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java
+++ b/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java
@@ -48,14 +48,14 @@ public class TickThread extends Thread {
@@ -34,10 +34,10 @@ index 6ef0042a355c65262bdb89dcf151bd644653216d..f009da59c9e54a6660d2f35104c56ac2
}
// Folia end - block plugins not marked as supported
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 55a095e00bfe15321d8a1d69beb232e9956b0df7..5eec2a2a543099b11335427f7cac212523e21dab 100644
index 804ea060fc5dc0d0ab89574a75604cdf911b4e6c..2bccd05d7c131ba98419007bb8688eddecf85643 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -323,7 +323,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -393,7 +393,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
}
// Folia start - block plugins not marked as supported
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <mrhua269@gmail.com>
Date: Thu, 9 Jul 2026 12:12:08 +0800
From: NanaChiyo0721 <nanachiyo0721@163.com>
Date: Sat, 8 Aug 2026 11:32:40 +0800
Subject: [PATCH] Add status bar
@@ -22,12 +22,12 @@ index f020f310c4bca49a23de91bea72ccd9941c0b03c..10b351d8bd6b0e117ecbe961ae2f1016
+ // KioCG end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a3f2e97c1e0c9c2add3c5efd5a5cebe84ace78bf..d47c1b8cc17eb13669fbe21670c3a6eaaa995844 100644
index e20a66e56f2e4520b2708d6ebc377392e4362816..7bbadcab57d3a2dbba0a4c48de043966454a1d50 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3396,4 +3396,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
super.knockback(strength, directionX, directionZ);
this.entity.hurtMarked = true;
@@ -3420,4 +3420,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
this.getHandle().fixedPose = false;
this.getHandle().updatePlayerPose();
}
+
+ // KioCG start - ChunkHot
@@ -25,10 +25,10 @@ index 10b351d8bd6b0e117ecbe961ae2f101686a38fe4..35137db138d8d14f9b9675ae51e135cb
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bec12eb481d305659c48205fe30677baba6fd091..f0c73d890df3b57336fa1c582447c0da9acdee78 100644
index 774997f11c8b50287c10e48c01278c4d995aae45..f4eb1594a1af0a50dfbf7dacb1b58e3903913aa3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1261,7 +1261,11 @@ public final class CraftServer implements Server {
@@ -1260,7 +1260,11 @@ public final class CraftServer implements Server {
.orElse(null);
RegistryAccess contextRegistryAccess = registryAccess;
if (worldGenSettings == null) {