Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +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@b560034 Avoid usages of RecipeChoice#getItemStack() (#8453)
PaperMC/Paper@603df98 FIx bedrock patterns (#8474)
PaperMC/Paper@ec00f99 Fix package for PlayerInventorySlotChangeEvent (#8475)
PaperMC/Paper@236a296 Add LivingEntity#swingHand(EquipmentSlot) convenience method (#8456)
PaperMC/Paper@7d64d7c Add converted Slot number to PlayerInventorySlotChangeEvent (#8482)
PaperMC/Paper@ed2c88b Add LivingEntity knockback API (#8479)
PaperMC/Paper@e1d4b26 Fix another case of missing chat headers
PaperMC/Paper@f7da209 Fix inconsistent isChunkLoaded calls
This commit is contained in:
BillyGalbreath
2022-10-18 11:18:02 -05:00
parent 8e04c6f326
commit cf6b7c3459
15 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e5af7ef4ada68922a70f593ccec555ecb50627a9..47d545a15b508454452699fe3e333b2bacc3159e 100644
index 961d25bbf868438bf5e5257bad745c8208a01171..90845d1d930c43f9363c75629517322726a264a8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index e5af7ef4ada68922a70f593ccec555ecb50627a9..47d545a15b508454452699fe3e333b2b
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 59608a53bbf0eccf118b4d65557444f6532fedb4..bfaa37739230107b73f81e227660e950d81d50a0 100644
index 4e615e5d5b8d79f6eaac2136be03961415fd093e..42978e1ea82b4d6a740150893518c4f6bd1562eb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3646,6 +3646,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3647,6 +3647,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 59608a53bbf0eccf118b4d65557444f6532fedb4..bfaa37739230107b73f81e227660e950
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3670,6 +3671,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3671,6 +3672,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
}