Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
This commit is contained in:
BillyGalbreath
2022-02-18 20:06:35 -06:00
parent d0ea018612
commit 5ad7f4bd90
36 changed files with 101 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0216-Toggle-for-kinetic-damage.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc..0f36cf3ab761d4f920b461054dba8e1dcf55ffc1 100644
index 17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490..aecebe3b368c4159e64da305b3b921ae33b1e1a4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2816,7 +2816,11 @@ public abstract class LivingEntity extends Entity {
@@ -2825,7 +2825,11 @@ public abstract class LivingEntity extends Entity {
if (f4 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F);
@@ -22,7 +22,7 @@ index ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc..0f36cf3ab761d4f920b461054dba8e1d
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7a3794a71c0a5bef69884e9452001472ce7b1be9..92cb1039d2d27c197d2e040e90d9de3572889174 100644
index b481c3bf0311058307b1fc38d68047e48c4df44d..b03142997900921e6cf4c105262ff08678e87097 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -176,12 +176,14 @@ public class PurpurWorldConfig {