Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01: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:
d5cb9308f fix #5224
d23f8b62e fix? #5222
0f2575de2 fix? #5222
7c3499702 fix? #5218
c8eec830b fix #5217
a235c77ce Adventure 4.5.0
This commit is contained in:
jmp
2021-02-22 04:42:43 -08:00
parent 55af1079b5
commit 274c7b2ccc
15 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0016-Player-invulnerabilities.patch
View File

@@ -67,10 +67,10 @@ index 771f634a06eca998853830d78b4d1546dd2b4c67..f4f6e85bd98ce57bf2daeb9ea30bccc2
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 72bd179a0b2a07be3924b37fa9fb853df50a454d..797b09fa01b039bd5f8ab30f0c4686dc7e1efe71 100644
index 7034f2d09b7e9911cba7834832a901389e6690dc..371285e86ef6d848c2a1c5eb1ce4bc2428405ccd 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1733,6 +1733,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1737,6 +1737,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -79,7 +79,7 @@ index 72bd179a0b2a07be3924b37fa9fb853df50a454d..797b09fa01b039bd5f8ab30f0c4686dc
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 60b2e560bbf4c5303e9334a496c6ced0e3c88b19..6beb06bfce96d364122ceda6d702cfb7315e4312 100644
index 8e49de2f89aded40d760d57f4ddfcb84f73deb1d..3416691e1fa95fc94dcc2dccf4722e324e2ff33b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -918,6 +918,8 @@ public abstract class PlayerList {