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@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

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 12517438b8b8366a37165cb057dfc040ec81fc3a..e44b0c3704ca6b7609f6638e43aa8abe1939bfd8 100644
index ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc..0f36cf3ab761d4f920b461054dba8e1dcf55ffc1 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2817,7 +2817,11 @@ public abstract class LivingEntity extends Entity {
@@ -2816,7 +2816,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 12517438b8b8366a37165cb057dfc040ec81fc3a..e44b0c3704ca6b7609f6638e43aa8abe
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c29c2eefb2dab541691f88f315fdea88343a0a96..6edd607952f087ae41f62478003b76053b43fa57 100644
index 7a3794a71c0a5bef69884e9452001472ce7b1be9..92cb1039d2d27c197d2e040e90d9de3572889174 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 {