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

Update to 1.18.2

Browse Source
This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,22 +5,17 @@ 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 17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490..aecebe3b368c4159e64da305b3b921ae33b1e1a4 100644
index 2773267524a58219876a84aa44b97094e155883a..360aa9d2f9d5a8ecd0db36a3715825222fec018e 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2825,7 +2825,11 @@ public abstract class LivingEntity extends Entity {
@@ -2828,6 +2828,7 @@ public abstract class LivingEntity extends Entity {
if (f4 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F);
- this.hurt(DamageSource.FLY_INTO_WALL, f4);
+ // Purpur start
+ if (level.purpurConfig.elytraKineticDamage) {
+ this.hurt(DamageSource.FLY_INTO_WALL, f4);
+ }
+ // Purpur end
if (f3 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);
+ if (level.purpurConfig.elytraKineticDamage) // Purpur
this.hurt(DamageSource.FLY_INTO_WALL, f3);
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b481c3bf0311058307b1fc38d68047e48c4df44d..b03142997900921e6cf4c105262ff08678e87097 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java