Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02: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:
PaperMC/Paper@0ddd20c Updated Upstream (CraftBukkit/Spigot)
PaperMC/Paper@9592da1 Add method to get highest anger level of warden
This commit is contained in:
BillyGalbreath
2022-08-14 04:43:41 -05:00
parent 0fd6a5698f
commit ac5c303a0d
23 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0005-Purpur-client-support.patch
View File

@@ -17,10 +17,10 @@ index 3615576c24d5d6790a6894a91180de25fa0e5a9c..266a26d73dd5aec427b64a638693decf
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab855fa87c 100644
index 9aab29dd7a09c306d6c0e1e8143daf005d611d65..0f9dea99893581122a6d5f9176b374c1c815973c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3645,6 +3645,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3653,6 +3653,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3669,6 +3670,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3677,6 +3678,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
}
@@ -43,7 +43,7 @@ index d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ef9c3a7b15a4901e1662e6d55504b9cbbb804ad3..a20e1a533e9f764fbf00e768fd8286c8f7868a78 100644
index 067d64ce06f626ce90b3ccf608d98f3c64fce335..6260f4246b24f5037e3cf718a50be3a70680132e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2897,4 +2897,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {