From a3ad19e1a6b8222806de6c2eac1943e992ae74e4 Mon Sep 17 00:00:00 2001 From: Shane Freeder <theboyetronic@gmail.com> Date: Wed, 22 May 2019 05:21:19 +0100 Subject: [PATCH] Actually fix compilation --- ...hods-for-working-with-arrows-stuck-in-living-.patch | 10 +--------- .../LivingEntity-Hand-Raised-Item-Use-API.patch | 2 +- .../Make-shield-blocking-delay-configurable.patch | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch index fbce249ada..d3b88f14d9 100644 --- a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -5,17 +5,9 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index e6249c2bf..2a4e4cb39 100644 +index e6249c2bf..5697728ce 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource - */ - boolean isCollidable(); - -+<<<<<<< HEAD - /** - * Returns the value of the memory specified. - * <p> @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param <T> the type of the passed value */ diff --git a/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch index 7b8a6aba1b..133a80289a 100644 --- a/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index a663d7ab1..adae86709 100644 +index e08dfe17f..6e3284b20 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -0,0 +0,0 @@ import org.bukkit.attribute.Attributable; diff --git a/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch index 303a552100..fd791993e4 100644 --- a/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ba7881a27..a663d7ab1 100644 +index ffbf3d7a8..e08dfe17f 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource