Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
06db5d08b0 Updated Upstream (Bukkit/CraftBukkit) (#6589)
810d200bb4 Improve interact distance check (#6591)

Airplane Changes:
8207533bdf Upstream
This commit is contained in:
William Blake Galbreath
2021-09-12 22:23:58 -05:00
parent acf2f845e4
commit 8bd08ceeea
53 changed files with 239 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,10 +82,10 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
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 9de4ca41c22fc92762b8c2705cdc8a5ffbe60233..8ea53a2c6f62c6e65257fa7eb094187529e6525b 100644
index 1ba2155e353b390cff90605f3158b8f61d531cb3..b81e796625ebd7cccc66212bb92b5a3bd2e3813e 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
@@ -1921,12 +1921,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -143,10 +143,10 @@ index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce
public boolean babiesAreRidable = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 59f7b83332a6eaaeb9b0e24f1329d5b11a8ae053..f7649d5e27888724f672de7673865522a30f7225 100644
index ee9752ec75a94be33b9f30fd5e0facc5af30ee65..04d178af71fcf353b967c891e4a46835cb731599 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2575,5 +2575,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2576,5 +2576,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}