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)

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

Paper Changes:
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,10 +121,10 @@ index ae3c16ec9404f126c50160d436b7732d82765fc5..aafc0d7275a8dc1df2c73974b9b77166
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a7a286e6875c18ae4cb610bf13b8a1b9764452c7..c2a801a6bcf8e796921bb1b82a7569aa8391f443 100644
index 81b85d93ce94ffa3dfddf70feff7c9c2ab5c6b37..4eee85bf2222f56e7ed4b57566692431706e22e2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2679,5 +2679,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2687,5 +2687,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}