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@84b5d4a Reorder bukkit damage source entity for explosion (#8553)
PaperMC/Paper@b4c1ae6 Fix MC-121048 (#8429)
PaperMC/Paper@825cb43 [ci skip] Add .fleet/ folder to .gitignore (#8574)
PaperMC/Paper@669fed4 Fix MC-179072 (#8421)
PaperMC/Paper@8f498dc Sync chunk load command improvements (#8554)
PaperMC/Paper@3299886 [ci skip] Add TheFruxz to the license MIT list (#8575)
PaperMC/Paper@0a6f100 Add more collision code skipping logic (#7581)
PaperMC/Paper@76503f8 Strip coordinates from lodestone compasses (#8561)
PaperMC/Paper@b95d4b2 Moving ATs from the at file to individual patches (#8573)
PaperMC/Paper@4a3ae59 [ci skip] Add check for git repo (#8578)
PaperMC/Paper@a7df847 Add Player Warden Warning API (#8470)
PaperMC/Paper@3ab194e Avoid a cubed max search distance for POIs (#8576)
This commit is contained in:
Ben Kerllenevich
2022-11-21 23:26:26 -05:00
parent 79accf69dc
commit 8da783d679
23 changed files with 96 additions and 96 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 5819e8e5e3c6f87eb123cf16091ea74357d53b3b..a56e79c852eaec4fbd7e428076323b01fda3463b 100644
index 3b122f521c166253f20d233c0fcebdede6660be5..f927090ed59b483124076c6d4eed4b55ac5c61d6 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,7 +17,7 @@ index 5819e8e5e3c6f87eb123cf16091ea74357d53b3b..a56e79c852eaec4fbd7e428076323b01
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 21c482725d2504b0aedb83ed2a7954b19c11bb61..9dc8a6570e95b4d281c9a28e441e4931058f155e 100644
index 187791ff8197be015856fdfa9159fb26558f95cf..15075c8705929de83adaf0f7afe7a7cfd40150ae 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3648,6 +3648,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -43,10 +43,10 @@ index 21c482725d2504b0aedb83ed2a7954b19c11bb61..9dc8a6570e95b4d281c9a28e441e4931
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 66830ccee464083879f79db4111e08fecee417ec..4708e516b0a4946b6e02ac4b3ba1c48ba3f8cd11 100644
index a5220a4e514865c70700527bcd2f941d852564c0..26a05a8835934093054e76057572f3f69410134d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2948,4 +2948,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2983,4 +2983,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end