Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18: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@41ab602 [ci skip] couple more fixes for build pr jar label (#8599)
PaperMC/Paper@c40f8d5 Sync offhand slot in menus (#7341)
PaperMC/Paper@425baed Fully deserialise persistent anger post async load (#8560)
PaperMC/Paper@ec6a9a3 Updated Upstream (Bukkit/CraftBukkit) (#8604)
PaperMC/Paper@96fdafd Player Entity Tracking Events (#4722)
PaperMC/Paper@407a445 Fix dumplisteners missing folder creation
PaperMC/Paper@b07d5e0 Limit pet look distance (#8612)
PaperMC/Paper@476ef25 Add missing Fluid type (#8608)
This commit is contained in:
Encode42
2022-12-07 12:05:48 -05:00
parent 86f2da583b
commit 482a83ff9f
21 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0114-Add-boat-fall-damage-config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fb80693c653568ff49167e9fef33ea9627409864..8bbb5a80956a0b25a3ef37351cf57f2646bf8f26 100644
index 43ac7d1d107c110f69464270853ebecb916f23a8..0e5d361eb5d42036e660946a1cbd9f1cc4b2930f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1035,7 +1035,16 @@ public class ServerPlayer extends Player {
@@ -1042,7 +1042,16 @@ public class ServerPlayer extends Player {
if (this.isInvulnerableTo(source)) {
return false;
} else {
@@ -27,7 +27,7 @@ index fb80693c653568ff49167e9fef33ea9627409864..8bbb5a80956a0b25a3ef37351cf57f26
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 78bbb55ef2c9370f38253b27f528c6d2e62a7fb3..0671853ed91ad046ad02cbb09188766e7afbaa9d 100644
index 2c1fb29b922b216615f50e5595ca6a53f1be56f8..633f8fa200efe91e7a21a3dc669b29f6474d8a29 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -115,6 +115,7 @@ public class PurpurWorldConfig {