From 57b84ca9f21b6a7e58e262e80267bc2d18e3f2d9 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:22:31 -0400 Subject: [PATCH] Updated Upstream (Purpur/Leaves) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@7f490a6 Updated Upstream (Paper) PurpurMC/Purpur@4f2fe31 Updated Upstream (Paper) PurpurMC/Purpur@4b57bed Updated Upstream (Paper) PurpurMC/Purpur@d49ca07 Updated Upstream (Paper) Leaves Changes: LeavesMC/Leaves@c19e742 Fix extra yggdrasil LeavesMC/Leaves@8be1ec2 1.21.1 LeavesMC/Leaves@8019141 Old BlockEntity behaviour LeavesMC/Leaves@a58f059 Better config command LeavesMC/Leaves@1a110f5 Fix #281 LeavesMC/Leaves@a8e403d Remove some performance LeavesMC/Leaves@f552216 Update Paper LeavesMC/Leaves@202c986 [release-skip] Fix Maven publish LeavesMC/Leaves@e199edf Fix Spigot EndPlatform destroy (#313) LeavesMC/Leaves@595afb8 Fakeplayer API update LeavesMC/Leaves@39440b4 Update bot API (#318) LeavesMC/Leaves@76d5ab8 Try fix (#309) LeavesMC/Leaves@9338453 Fix crash cause by fake player and phantom spawner. (#331) LeavesMC/Leaves@3436062 Fix bytebuf api, fix #334 (#335) LeavesMC/Leaves@c33b547 New FakePlayer (#337) LeavesMC/Leaves@615efda Update Paper LeavesMC/Leaves@56d306c Fix Stackable ShulkerBoxes (#329) LeavesMC/Leaves@23c47a3 Enhance bot api, fix somethings (#341) LeavesMC/Leaves@bff6bbd Update Paper LeavesMC/Leaves@dd487df Fix fakeplayer use action (#345) LeavesMC/Leaves@2e311f0 Update Paper LeavesMC/Leaves@b8cd2ec Fix CommandUtil(#348) (#349) LeavesMC/Leaves@95e6661 Make lever and cocoa wrench-able by shear (#351) LeavesMC/Leaves@6c5cc79 Fix #353 LeavesMC/Leaves@b33c46c Update Paper LeavesMC/Leaves@f830919 Update Paper LeavesMC/Leaves@9d90760 Revert raid changes (#361) LeavesMC/Leaves@d2b7fab Fix Incorrect Collision Behavior for Block Shape (fix #344) (#363) LeavesMC/Leaves@6a9d61b Allow anvil destroy item entities and disable vault blacklist (#364) LeavesMC/Leaves@e745ddd Update Paper LeavesMC/Leaves@ab75141 Fix fakeplayer rotation action (#365) LeavesMC/Leaves@423df96 Fix bot changing dimension (#366) --- patches/api/0004-Purpur-API-Changes.patch | 2 +- .../0001-Purpur-generated-api-Changes.patch | 2 +- patches/server/0011-Purpur-Server-Changes.patch | 2 +- patches/server/0029-Leaves-Server-Utils.patch | 2 +- .../server/0034-Leaves-Syncmatica-Protocol.patch | 14 +++++++++----- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/patches/api/0004-Purpur-API-Changes.patch b/patches/api/0004-Purpur-API-Changes.patch index 10cef10ca..4fb35b106 100644 --- a/patches/api/0004-Purpur-API-Changes.patch +++ b/patches/api/0004-Purpur-API-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: e12a4ded8caa0ee5aa47e8ceb80fd1985ed74ad7 +Commit: d49ca07e0098cd9e923d43b7fe67fb7e2a8eb511 Patches below are removed in this patch: Pufferfish-API-Changes.patch diff --git a/patches/generated-api/0001-Purpur-generated-api-Changes.patch b/patches/generated-api/0001-Purpur-generated-api-Changes.patch index 7aa68f4be..46610cba8 100644 --- a/patches/generated-api/0001-Purpur-generated-api-Changes.patch +++ b/patches/generated-api/0001-Purpur-generated-api-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: e12a4ded8caa0ee5aa47e8ceb80fd1985ed74ad7 +Commit: d49ca07e0098cd9e923d43b7fe67fb7e2a8eb511 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java index 02411466bdcf4ff731f01ccebb2c99942e0db878..2718c0e5061838b01881bb231c53f4da348adce3 100644 diff --git a/patches/server/0011-Purpur-Server-Changes.patch b/patches/server/0011-Purpur-Server-Changes.patch index a1447c509..b6bf2aa95 100644 --- a/patches/server/0011-Purpur-Server-Changes.patch +++ b/patches/server/0011-Purpur-Server-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: e12a4ded8caa0ee5aa47e8ceb80fd1985ed74ad7 +Commit: d49ca07e0098cd9e923d43b7fe67fb7e2a8eb511 Patches below are removed in this patch: Pufferfish-Server-Changes.patch diff --git a/patches/server/0029-Leaves-Server-Utils.patch b/patches/server/0029-Leaves-Server-Utils.patch index 5eb4959ca..464bc82a6 100644 --- a/patches/server/0029-Leaves-Server-Utils.patch +++ b/patches/server/0029-Leaves-Server-Utils.patch @@ -9,7 +9,7 @@ and change store way to sql maybe? Original license: GPLv3 Original project: https://github.com/LeavesMC/Leaves -Commit: 1782bd4806074628c93c2ef265e028b4fbdba081 +Commit: 423df9642eca64b3e30400315a790c19160db489 diff --git a/src/main/java/org/leavesmc/leaves/LeavesLogger.java b/src/main/java/org/leavesmc/leaves/LeavesLogger.java new file mode 100644 diff --git a/patches/server/0034-Leaves-Syncmatica-Protocol.patch b/patches/server/0034-Leaves-Syncmatica-Protocol.patch index 92d15e674..65f4592d7 100644 --- a/patches/server/0034-Leaves-Syncmatica-Protocol.patch +++ b/patches/server/0034-Leaves-Syncmatica-Protocol.patch @@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves This patch is Powered by Syncmatica (https://github.com/End-Tech/syncmatica) diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 041d2286ab74d522f4f49a1188dfb37a6aeb595d..efc97f8722993e1c1899422465a6b8b12ebe5fce 100644 +index 86a7bcc71e419a22ed00dfaf440e8658888b4218..7bd773b9d3015565f44105a8486f6a85c979fcbd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -319,6 +319,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -1366,10 +1366,10 @@ index 0000000000000000000000000000000000000000..cb5dffe81c4f0becad0ae2fbf7e9143f +} diff --git a/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticaProtocol.java b/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticaProtocol.java new file mode 100644 -index 0000000000000000000000000000000000000000..d2625b1ca6fc207dfb8c282d3dc0baa2701479c9 +index 0000000000000000000000000000000000000000..4ee092cea91cb50d0f9269d4dc22117f0fd0a60a --- /dev/null +++ b/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticaProtocol.java -@@ -0,0 +1,122 @@ +@@ -0,0 +1,126 @@ +package org.leavesmc.leaves.protocol.syncmatica; + +import org.jetbrains.annotations.NotNull; @@ -1389,6 +1389,7 @@ index 0000000000000000000000000000000000000000..d2625b1ca6fc207dfb8c282d3dc0baa2 + public static final String PROTOCOL_ID = "syncmatica"; + public static final String PROTOCOL_VERSION = "leaves-syncmatica-1.1.0"; + ++ private static boolean loaded = false; + private static final File litematicFolder = new File("." + File.separator + "syncmatics"); + private static final PlayerIdentifierProvider playerIdentifierProvider = new PlayerIdentifierProvider(); + private static final CommunicationManager communicationManager = new CommunicationManager(); @@ -1421,8 +1422,11 @@ index 0000000000000000000000000000000000000000..d2625b1ca6fc207dfb8c282d3dc0baa2 + } + + public static void init() { -+ litematicFolder.mkdirs(); -+ syncmaticManager.startup(); ++ if (!loaded) { ++ litematicFolder.mkdirs(); ++ syncmaticManager.startup(); ++ loaded = true; ++ } + } + + @NotNull