Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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

8
patches/server/0020-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e25a6a344 100644
index 934d24bae4a5d6780434a0918c04dfffc12f2364..da8a924faf6ed16f2cf669439f5ba1175b1b8cc0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
@@ -54,7 +54,7 @@ index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e
return this;
}
}
@@ -1939,6 +1948,7 @@ public class ServerPlayer extends Player {
@@ -1943,6 +1952,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2422,9 +2432,17 @@ public class ServerPlayer extends Player {
@@ -2426,9 +2436,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -82,7 +82,7 @@ index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c6ef86206fc498a0fcd1c1527516d98e00a5df40..5ae1002dde94a242fd6c19bb22a52416eba229f2 100644
index f6a091ab2f549761b8d19fb35e1db907954a9717..e4b9edb4226ce3213181b6deb2fca6e9fab3e569 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1912,12 +1912,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser