From 6cbcd3a78598771be88e368dd711f73abf23617f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 23 May 2019 00:01:24 -0500 Subject: [PATCH] Rebuild patches --- .../0005-Implement-LivingEntity-safeFallDistance.patch | 6 +++--- patches/api/0006-Integrate-ridables.patch | 6 +++--- patches/server/0001-Rebrand.patch | 8 ++++---- .../0008-Implement-LivingEntity-safeFallDistance.patch | 8 ++++---- patches/server/0011-Integrate-ridables.patch | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/api/0005-Implement-LivingEntity-safeFallDistance.patch b/patches/api/0005-Implement-LivingEntity-safeFallDistance.patch index b5cf8e206..29aeb333e 100644 --- a/patches/api/0005-Implement-LivingEntity-safeFallDistance.patch +++ b/patches/api/0005-Implement-LivingEntity-safeFallDistance.patch @@ -1,4 +1,4 @@ -From c9c5d4932bf02be755c90c32d537803076bb30f5 Mon Sep 17 00:00:00 2001 +From 58b35093b4a79b959e6737877fccc4d322bce0fb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 May 2019 12:58:19 -0500 Subject: [PATCH] Implement LivingEntity safeFallDistance @@ -8,10 +8,10 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance 1 file changed, 16 insertions(+) diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index fe87caf1..d737937e 100644 +index a78f390d..f47a6869 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -655,4 +655,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -681,4 +681,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ boolean isHandRaised(); // Paper end diff --git a/patches/api/0006-Integrate-ridables.patch b/patches/api/0006-Integrate-ridables.patch index be3c811f3..b7656dbff 100644 --- a/patches/api/0006-Integrate-ridables.patch +++ b/patches/api/0006-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From dc4ce39da212c22db5f734553ebd96371012b628 Mon Sep 17 00:00:00 2001 +From 71371455d2847adc6228a22c726a3fe05cfe68f0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 3 May 2019 06:08:35 -0500 Subject: [PATCH] Integrate ridables @@ -8,10 +8,10 @@ Subject: [PATCH] Integrate ridables 1 file changed, 14 insertions(+) diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index d737937e..cf9dde56 100644 +index f47a6869..3a896185 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -670,5 +670,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -696,5 +696,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param safeFallDistance Safe fall distance */ void setSafeFallDistance(float safeFallDistance); diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 533dff5c6..d414d12c5 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From f0f99f77774709baa07af666ddb010f4fb93da02 Mon Sep 17 00:00:00 2001 +From fe8f0a3e4e712232fa71d0296a24ce1a4c62f0e6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -83,10 +83,10 @@ index cd6e25923..bb227bc0f 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 70f730996..f2b243326 100644 +index f1cd38d42..d3316a6ac 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1405,7 +1405,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 5 May 2019 12:58:45 -0500 Subject: [PATCH] Implement LivingEntity safeFallDistance @@ -39,7 +39,7 @@ index 8ce2fca80..686bca4f2 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 20e8ae96d..b27a9efcc 100644 +index 75d845a75..0cb8c6cbc 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 { @@ -73,10 +73,10 @@ index 6404b32b2..f8a8da637 100644 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 b85385ba4..640faccfd 100644 +index c4aa1945f..98f62d776 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -686,4 +686,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -699,4 +699,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return getHandle().isHandRaised(); } // Paper end diff --git a/patches/server/0011-Integrate-ridables.patch b/patches/server/0011-Integrate-ridables.patch index 73606c997..a448a4bb8 100644 --- a/patches/server/0011-Integrate-ridables.patch +++ b/patches/server/0011-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From f9ce19e5fc6f8f23906c90d87730d4fbb72b803c Mon Sep 17 00:00:00 2001 +From 6291010d3faeae12377b6aa51a13d17a5b00e73c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -1246,10 +1246,10 @@ index 000000000..74ff48259 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 640faccfd..2390baa75 100644 +index 98f62d776..83eeab5c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -697,5 +697,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -710,5 +710,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setSafeFallDistance(float safeFallDistance) { getHandle().safeFallDistance = safeFallDistance; }