mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c6aa61e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561) PaperMC/Paper@93b435d [ci skip] better instructions for patch apply conflict (#11568) PaperMC/Paper@42a1901 Correctly adopt upstream item EAR fix (#11582) PaperMC/Paper@fcb6c72 Correctly pass velocity native compressor (#11509)
This commit is contained in:
@@ -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 4c5f573594c53edee96b498fa0852a3dee59cef8..fd18e01249d9b9958200ee16efaeeaf11360bafe 100644
|
||||
index 543eef5062fb77c880905b9b550e5be75893d2db..328ce5ec4375a14a8ede632a9975b9871c2eab8b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -3178,6 +3178,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@@ -3179,6 +3179,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
|
||||
if (f > 0.0F) {
|
||||
this.playSound(this.getFallDamageSound((int) f), 1.0F, 1.0F);
|
||||
|
||||
Reference in New Issue
Block a user