Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
0fc6213f9c Allow skipping writing of comments to server.properties (#6251)
aec9781f52 Fix incorrect colors in ConsoleCommandSender messages with TranslatableComponents (#6287)
9a74e70cc0 fix: boats' bounding boxes must be deflated, not inflated (#6314)
6226208d64 Fix SysoutCatcher when plugins log before initialisation (Fixes #6323)
d239eca9dd Fix writing server.properties with wrong encoding (#6322)
f521a18a17 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2021-08-06 01:07:04 -05:00
parent d3a45fc041
commit 956156df48
13 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -33285,7 +33285,7 @@ index baa25df9f446c8edea9666983425df31c32a13ff..f9ed48f5bbde84fd1804e482f2777b51
public void onTrackingStart(Entity entity) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e32da100eabf0d3de12375402e9378c726811358..1c9aec21aa22d0d202a023e9252d1412685ed4b0 100644
index 82eaf3bd7332b173197d81eaebdf58c6f43d6a23..8e795c9380eb0379838ab4881ba6393d57e8e92c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,7 +261,7 @@ public class ServerPlayer extends Player {
@@ -33315,7 +33315,7 @@ index e32da100eabf0d3de12375402e9378c726811358..1c9aec21aa22d0d202a023e9252d1412
this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
}
}
@@ -1558,6 +1558,18 @@ public class ServerPlayer extends Player {
@@ -1562,6 +1562,18 @@ public class ServerPlayer extends Player {
this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
this.doCloseContainer();
}
@@ -38556,7 +38556,7 @@ index 7dc26321e20e26821096e79356a358879306cd78..2e79e2a23a4aec4b526814f7e959232c
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index ea7df53656766a8dc4ab5fe66de894301db634e1..b153a8c9e7fdf5560148f02ba2f52c37ad3b5ace 100644
index eb0c436414a66c530d888348c3190eb563b8b44f..4bd8823bfee3fcdeba5c5b7aae3489a92c2ac536 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -146,6 +146,13 @@ public class Main {