Skip to content

Commit

Permalink
Updated Upstream (Purpur/Leaves)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
Dreeam-qwq committed Oct 30, 2024
1 parent 90a7b3b commit 57b84ca
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion patches/api/0004-Purpur-API-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion patches/server/0011-Purpur-Server-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion patches/server/0029-Leaves-Server-Utils.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions patches/server/0034-Leaves-Syncmatica-Protocol.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -1421,8 +1422,11 @@ index 0000000000000000000000000000000000000000..d2625b1ca6fc207dfb8c282d3dc0baa2
+ }
+
+ public static void init() {
+ litematicFolder.mkdirs();
+ syncmaticManager.startup();
+ if (!loaded) {
+ litematicFolder.mkdirs();
+ syncmaticManager.startup();
+ loaded = true;
+ }
+ }
+
+ @NotNull
Expand Down

0 comments on commit 57b84ca

Please sign in to comment.