Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@e5bbb56 Added 1.19 kick event causes (#8204)
This commit is contained in:
BillyGalbreath
2022-07-29 12:59:04 -05:00
parent 13320470dc
commit 723e3703b2
17 changed files with 53 additions and 53 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 94944ba458178f9e5b772224da329bb5d85f4394..94d87f6bd2c27b0d6cc4547e8bc6e87b
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 ae30be81679f24c20e1d102c91f58576cd32c09c..d12ebf81c437d104de2c2087209ff9311121ba43 100644
index 86c91ba9ddf1042f832c7a7379533040624fff44..1cb441e7f909dc15fb1fa3cf83657549dd8b6605 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3592,6 +3592,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3594,6 +3594,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 ae30be81679f24c20e1d102c91f58576cd32c09c..d12ebf81c437d104de2c2087209ff931
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3616,6 +3617,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3618,6 +3619,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 ae30be81679f24c20e1d102c91f58576cd32c09c..d12ebf81c437d104de2c2087209ff931
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 d2249145046d728240cf1ae0b71c9ec16184bc18..a3522f87a1f3c1efef6f65d2ba37ba0eccbc5fce 100644
index 9f34358dfcb95104c5bb9e63fbe295e6e049a55d..f5e2a82f279e8c91b736410147d5e8476f3da128 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2881,4 +2881,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {