diff options
Diffstat (limited to 'patches/api')
7 files changed, 25 insertions, 14 deletions
diff --git a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch index 5ec536beeb..20b94e44f1 100644 --- a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch +++ b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch @@ -49,10 +49,10 @@ index 0000000000000000000000000000000000000000..f52644fab1522bdf83ff4f489e9805b2 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ad885a0775b387e3e8ca6bfae80c18465038056c..93d20f67bf856d80226470ae2442d199d3e2f45b 100644 +index ad885a0775b387e3e8ca6bfae80c18465038056c..454533528fc05f632b22ca81909b6eac3841e26e 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -151,6 +151,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -151,6 +151,61 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ @Nullable public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode); @@ -82,6 +82,17 @@ index ad885a0775b387e3e8ca6bfae80c18465038056c..93d20f67bf856d80226470ae2442d199 + * Gets information about the entity being targeted + * + * @param maxDistance this is the maximum distance to scan ++ * @param ignoreBlocks true to scan through blocks ++ * @param entityPredicate predicate to determine if an entity can be targeted ++ * @return entity being targeted, or null if no entity is targeted ++ */ ++ @Nullable ++ public Entity getTargetEntity(int maxDistance, boolean ignoreBlocks, @Nullable java.util.function.Predicate<Entity> entityPredicate); ++ ++ /** ++ * Gets information about the entity being targeted ++ * ++ * @param maxDistance this is the maximum distance to scan + * @return TargetEntityInfo about the entity being targeted, + * or null if no entity is targeted + */ diff --git a/patches/api/0187-Entity-Jump-API.patch b/patches/api/0187-Entity-Jump-API.patch index 6e14c963f0..d35df5a5ea 100644 --- a/patches/api/0187-Entity-Jump-API.patch +++ b/patches/api/0187-Entity-Jump-API.patch @@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 93d20f67bf856d80226470ae2442d199d3e2f45b..5ab8db52160049e36464df4e20e374b8849ef29c 100644 +index 454533528fc05f632b22ca81909b6eac3841e26e..19806ef742f08aa1561fc4081724177c6d9e6a90 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -802,5 +802,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -813,5 +813,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ @NotNull org.bukkit.inventory.EquipmentSlot getHandRaised(); diff --git a/patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch index 1416b1373a..1640779ddf 100644 --- a/patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5ab8db52160049e36464df4e20e374b8849ef29c..1b6c2b2cfb910e7651e7f18ea407e31db685af8a 100644 +index 19806ef742f08aa1561fc4081724177c6d9e6a90..83303ef5376a59cff39f73142e35f816cf08e1c3 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -822,5 +822,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -833,5 +833,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param jumping entity jump state */ void setJumping(boolean jumping); diff --git a/patches/api/0234-Add-LivingEntity-clearActiveItem.patch b/patches/api/0234-Add-LivingEntity-clearActiveItem.patch index 2855c9e780..e4b963160e 100644 --- a/patches/api/0234-Add-LivingEntity-clearActiveItem.patch +++ b/patches/api/0234-Add-LivingEntity-clearActiveItem.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 1b6c2b2cfb910e7651e7f18ea407e31db685af8a..751a7345b650e96bbfd3ca9d22c9623bd5444f67 100644 +index 83303ef5376a59cff39f73142e35f816cf08e1c3..767c47ad1fdaa1c61b9dfc0d6d181ab8dd53bb46 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -773,6 +773,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -784,6 +784,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @Nullable ItemStack getActiveItem(); diff --git a/patches/api/0240-Expose-LivingEntity-hurt-direction.patch b/patches/api/0240-Expose-LivingEntity-hurt-direction.patch index a6f7ce6054..38f14c52ed 100644 --- a/patches/api/0240-Expose-LivingEntity-hurt-direction.patch +++ b/patches/api/0240-Expose-LivingEntity-hurt-direction.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 751a7345b650e96bbfd3ca9d22c9623bd5444f67..330eab77547ae059f716418f71ad1d3391a57a9b 100644 +index 767c47ad1fdaa1c61b9dfc0d6d181ab8dd53bb46..4f6f363385893f07959d85d7a5af05a195ad1db0 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -852,5 +852,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -863,5 +863,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param quantity quantity of item */ void playPickupItemAnimation(@NotNull Item item, int quantity); diff --git a/patches/api/0310-Add-more-line-of-sight-methods.patch b/patches/api/0310-Add-more-line-of-sight-methods.patch index 28e2128eee..891ec95a2e 100644 --- a/patches/api/0310-Add-more-line-of-sight-methods.patch +++ b/patches/api/0310-Add-more-line-of-sight-methods.patch @@ -24,10 +24,10 @@ index def9f0f9803e71cbe57abcffeb9114a5ab462e54..d149dd1d3d2703a428006e0c3ab5f925 /** diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 330eab77547ae059f716418f71ad1d3391a57a9b..cda05df6784dd4d6a09710a416dcb71c016dabfc 100644 +index 4f6f363385893f07959d85d7a5af05a195ad1db0..23d167fcac15f2169c19640fd7c01b198b6d4003 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -483,6 +483,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -494,6 +494,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ public boolean hasLineOfSight(@NotNull Entity other); diff --git a/patches/api/0317-Stinger-API.patch b/patches/api/0317-Stinger-API.patch index 12373dc546..366dfa2dde 100644 --- a/patches/api/0317-Stinger-API.patch +++ b/patches/api/0317-Stinger-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index cda05df6784dd4d6a09710a416dcb71c016dabfc..31353bd20404a8c2acf6bf0df524dc3cae324272 100644 +index 23d167fcac15f2169c19640fd7c01b198b6d4003..e98603eeebfeb4ca5071482db857ef08f1a9183f 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -336,6 +336,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -347,6 +347,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ public void setArrowsInBody(int count); |