From ef499e4c3fdceca36614cc4cdbd970d522a76629 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 8 Mar 2025 01:12:35 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0a4eb8f3 Send the pong response packet immediately. This packet is similar to the keep alive packet and is processed async. (#12242) PaperMC/Paper@7a3d0c4e Fix recipe being always null in PrepareItemCraftEvent from the api (#12237) PaperMC/Paper@a6ce734f Fix zombie villager not dropping item once cured (#12230) PaperMC/Paper@ce300162 Skip alpha channel for custom model data component (#12205) --- .../features/0048-Optimize-sun-burn-tick.patch | 6 +++--- .../paper-patches/features/0004-Gale-configuration.patch | 4 ++-- .../features/0016-Specific-interval-TPS-API.patch | 4 ++-- .../paper-patches/features/0017-5-second-TPS-average.patch | 4 ++-- .../paper-patches/features/0018-Last-tick-time-API.patch | 4 ++-- gradle.properties | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch b/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch index fd9e22d..8be2f0d 100644 --- a/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch +++ b/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch @@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index eee00c4d23a8b4c7e66d45d843ffc087fb183702..9a5bd53aaf02cdbc0d452af3e288a6f56f116ec9 100644 +index b260930b445e7621382bbe22e1e1c1c7be26e2f2..e4e32151437148f37fd370f9f88ec1bb84106c65 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -2021,10 +2021,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -39,10 +39,10 @@ index eee00c4d23a8b4c7e66d45d843ffc087fb183702..9a5bd53aaf02cdbc0d452af3e288a6f5 public void absMoveTo(double x, double y, double z, float yRot, float xRot) { this.absMoveTo(x, y, z); diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 2568a7f2459ed783d4612546b86d46721d48a396..acf2e306ad26e5f0413ee320b9b514b56fefc21b 100644 +index 49f4d8d4cc36669f889d9970d1dfdf3af4a720ce..7b5d04de4e657a82f51d6f4ad287693fcaa14f1d 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -1594,20 +1594,32 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1596,20 +1596,32 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void playAttackSound() { } diff --git a/gale-server/paper-patches/features/0004-Gale-configuration.patch b/gale-server/paper-patches/features/0004-Gale-configuration.patch index 63b9ea4..2dbb2c1 100644 --- a/gale-server/paper-patches/features/0004-Gale-configuration.patch +++ b/gale-server/paper-patches/features/0004-Gale-configuration.patch @@ -144,7 +144,7 @@ index 05339a176083af667c16f77d76dc1878dafce3f0..9ca55cba185b9de566f911b08d671bee } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a0a1ed48f67f238c492d4acdd3b21147595df9e2..bdb674f238fb2d24774c6af96fe6a3828346a18f 100644 +index 99beb7ec6e1864426492f4e27e650ab97ce6d4b5..99232b8b2fc7840cf6c5e98dab88935ec0f9962d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1088,6 +1088,7 @@ public final class CraftServer implements Server { @@ -155,7 +155,7 @@ index a0a1ed48f67f238c492d4acdd3b21147595df9e2..bdb674f238fb2d24774c6af96fe6a382 for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -3051,6 +3052,14 @@ public final class CraftServer implements Server { +@@ -3052,6 +3053,14 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } diff --git a/gale-server/paper-patches/features/0016-Specific-interval-TPS-API.patch b/gale-server/paper-patches/features/0016-Specific-interval-TPS-API.patch index 5f415c7..5ba6a46 100644 --- a/gale-server/paper-patches/features/0016-Specific-interval-TPS-API.patch +++ b/gale-server/paper-patches/features/0016-Specific-interval-TPS-API.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7735a4190fc2338231304446f373346f24540984..c4d08fd27f1a2f6c902abaa8c88886ec216ffba3 100644 +index 94ba49014e743683b7ad7fb00f9e9ffc2770d5e6..6db57e2085a8a3d94c1620ce7750c7cece190568 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3106,6 +3106,23 @@ public final class CraftServer implements Server { +@@ -3107,6 +3107,23 @@ public final class CraftServer implements Server { }; } diff --git a/gale-server/paper-patches/features/0017-5-second-TPS-average.patch b/gale-server/paper-patches/features/0017-5-second-TPS-average.patch index b65d27a..dbc46ba 100644 --- a/gale-server/paper-patches/features/0017-5-second-TPS-average.patch +++ b/gale-server/paper-patches/features/0017-5-second-TPS-average.patch @@ -58,10 +58,10 @@ index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca79 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c4d08fd27f1a2f6c902abaa8c88886ec216ffba3..19a14032a8f4ff937b1dea46c67806060204c558 100644 +index 6db57e2085a8a3d94c1620ce7750c7cece190568..87f32be1190ea72e315a2af2a0b9cd3c14062f1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3106,7 +3106,26 @@ public final class CraftServer implements Server { +@@ -3107,7 +3107,26 @@ public final class CraftServer implements Server { }; } diff --git a/gale-server/paper-patches/features/0018-Last-tick-time-API.patch b/gale-server/paper-patches/features/0018-Last-tick-time-API.patch index 50977fd..436dc47 100644 --- a/gale-server/paper-patches/features/0018-Last-tick-time-API.patch +++ b/gale-server/paper-patches/features/0018-Last-tick-time-API.patch @@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 19a14032a8f4ff937b1dea46c67806060204c558..93f115da494a66a756961b0cc16dea11010ea54f 100644 +index 87f32be1190ea72e315a2af2a0b9cd3c14062f1d..5ee4209b8d9cb1fee13b950c17cc05920c2b82b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3346,4 +3346,21 @@ public final class CraftServer implements Server { +@@ -3347,4 +3347,21 @@ public final class CraftServer implements Server { this.console.addPluginAllowingSleep(plugin.getName(), value); } // Paper end - API to check if the server is sleeping diff --git a/gradle.properties b/gradle.properties index db946d8..9093f4b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=5538d24d72a418491b80e89d6f7710548ac46687 +paperRef=ce3001621894ea775206abe455442d0aeeef3535 org.gradle.configuration-cache=true org.gradle.caching=true