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 appears to apply and compile correctly

Paper Changes:
7358bf02 [Auto] Updated Upstream (CraftBukkit/Spigot)
8df6e39b [CI-SKIP] Fix version for groovy artifact (1.16.4) (#4730)
0e73fdbf OBFHELPERS (#4733)
This commit is contained in:
William Blake Galbreath
2020-11-04 13:08:22 -06:00
parent f15d3f0497
commit f0b8bd76a6
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,10 +67,10 @@ index 77156ecff2..1360127549 100644
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 57e22552e0..d75447ec97 100644
index 4365d0bbb5..727975c26b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1650,6 +1650,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1652,6 +1652,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -108,10 +108,10 @@ index 2578a4677d..c441fcea9b 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d76b167f5e..612152a0b3 100644
index 93c8f9fc8d..21dc18c653 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2222,5 +2222,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2232,5 +2232,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetIdleTimer();
}