Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17: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:
abca14ff9 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2020-12-21 00:45:03 -08:00
parent 25c7772584
commit 3b18ff8cb9
28 changed files with 68 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0012-LivingEntity-safeFallDistance.patch
View File

@@ -30,7 +30,7 @@ index fcb31147622b4b81934be05ffc8de5e821ce69b7..ce26e65aaf25a41663ecd8c935967c33
protected int getChestSlots() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c..309a20e06461aeb362080b9aeb256f2c73d548a5 100644
index 6a3d73b33f04e2c66b4ba9ebe58f887048ae83d6..fea03568e8af3a0b355204bab0c99fdd54913688 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {
@@ -52,7 +52,7 @@ index c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c..309a20e06461aeb362080b9aeb256f2c
if (!iblockdata.isAir()) {
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
@@ -1679,7 +1680,7 @@ public abstract class EntityLiving extends Entity {
@@ -1685,7 +1686,7 @@ public abstract class EntityLiving extends Entity {
MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);