Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0014-LivingEntity-safeFallDistance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b3921a084d20a25a6ea775faae43493030aafd77..28d5fc868498a4a6746b9defa1c06da27a4aa495 100644
index ecc06c084625c24b9ac8045b1d53e75dfffbdea5..39dfda78320bc04ffb9b4be7b34abef84d4c8eeb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
@@ -27,7 +27,7 @@ index b3921a084d20a25a6ea775faae43493030aafd77..28d5fc868498a4a6746b9defa1c06da2
if (!landedState.isAir()) {
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
@@ -1883,7 +1884,7 @@ public abstract class LivingEntity extends Entity {
@@ -1887,7 +1888,7 @@ public abstract class LivingEntity extends Entity {
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
@@ -37,10 +37,10 @@ index b3921a084d20a25a6ea775faae43493030aafd77..28d5fc868498a4a6746b9defa1c06da2
protected void playBlockFallSound() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index 790f0940156b9c6d4aa1869a4ab50292faa246c5..1e748c223c223deb1465a250548b39ed559cf5de 100644
index 54401524a2be27e18d5e616e9bb8481007c7af88..16b72398645757ca194cb638f46b4528283e2199 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
@@ -322,7 +322,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -321,7 +321,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@Override
protected int calculateFallDamage(float fallDistance, float damageMultiplier) {