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

Update to 1.14

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-06 22:37:10 -05:00
committed by BillyGalbreath
parent a4bfd94c63
commit b8fed8aaf2
16 changed files with 726 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/server/0007-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From 9b22151ca279174b771b39bf13bea6f2422c9700 Mon Sep 17 00:00:00 2001
From 9fb9afd68241fd01be4dfdf00f0211294b8471d6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -12,24 +12,24 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
5 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index dd827aea..053a880c 100644
index d9e5eaad1..bcbade19e 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -7,6 +7,9 @@ public class EntityGiantZombie extends EntityMonster {
public EntityGiantZombie(World world) {
super(EntityTypes.GIANT, world);
this.setSize(this.width * 6.0F, this.length * 6.0F);
@@ -4,6 +4,9 @@ public class EntityGiantZombie extends EntityMonster {
public EntityGiantZombie(EntityTypes<? extends EntityGiantZombie> entitytypes, World world) {
super(entitytypes, world);
+ // Purpur start
+ this.safeFallDistance = 10.0F;
+ // Purpur end
}
public float getHeadHeight() {
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 95327763..e211b95c 100644
index 8ce2fca80..686bca4f2 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -181,7 +181,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -179,7 +179,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
this.a(SoundEffects.ENTITY_HORSE_LAND, 0.4F, 1.0F);
}
@@ -39,7 +39,7 @@ index 95327763..e211b95c 100644
if (i > 0) {
this.damageEntity(DamageSource.FALL, (float) i);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4d5459d2..13a3bd02 100644
index dacaa16e0..488ecbaa9 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -50,8 +50,8 @@ index 4d5459d2..13a3bd02 100644
boolean forceDrops;
ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
@@ -1368,7 +1369,7 @@ public abstract class EntityLiving extends Entity {
super.c(f, f1);
@@ -1522,7 +1523,7 @@ public abstract class EntityLiving extends Entity {
super.b(f, f1);
MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
- int i = MathHelper.f((f - 3.0F - f2) * f1);
@@ -60,23 +60,23 @@ index 4d5459d2..13a3bd02 100644
if (i > 0) {
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index 82a32c61..5e752b0c 100644
index 6404b32b2..f8a8da637 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -318,7 +318,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
}
@@ -344,7 +344,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
public void c(float f, float f1) {
@Override
public void b(float f, float f1) {
- int i = MathHelper.f((f * 0.5F - 3.0F) * f1);
+ int i = MathHelper.f((f * 0.5F - this.safeFallDistance) * f1); // Purpur
if (i > 0) {
if (f >= 6.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index d6a4bc64..89a49f03 100644
index b85385ba4..640faccfd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -633,4 +633,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -686,4 +686,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return getHandle().isHandRaised();
}
// Paper end