Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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:
47740f67 Updated Upstream (CraftBukkit)
948c20e0 Merge remote-tracking branch 'origin/master' into progress/1.16.2
60a5ca6d Fix regex mistake in CB NBT int deserialization (#4146)
This commit is contained in:
William Blake Galbreath
2020-08-17 21:10:02 -05:00
parent fc99d9cbbd
commit cae1e7eb26
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0025-Player-invulnerabilities.patch
View File

@@ -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 087cb11b5d..eefb4bd74b 100644
index 6438cca019..b7f05ac069 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2168,5 +2168,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2164,5 +2164,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetIdleTimer();
}