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

Paper Changes:
PaperMC/Paper@93829bb Account for dimension type in portal void damage check (#9602)
PaperMC/Paper@a73ed95 Updated Upstream (CraftBukkit/Spigot) (#9598)
This commit is contained in:
granny
2023-08-13 22:51:10 -07:00
parent 1846bae1b6
commit aeecb71060
20 changed files with 58 additions and 58 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 1abb122a33eaf55de752d3d91bca8c1ee888dfd4..1897c0e8922aa654f03267cb8ad1a06a
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 0281285ef491ef0abc1266601420345ba679a3be..4a775ffe8880c90def23e421fd3de17f9440f728 100644
index 33028fa1e892408ddf1ccfdd942ade634deb1d89..e0094bc6aad713685840255cb036e8a9c905732e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3253,5 +3253,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3248,5 +3248,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}