From b37fbbca3d6d6047dcdb8200358b7fe94d858b75 Mon Sep 17 00:00:00 2001 From: Jake Potrebic <15055071+Machine-Maker@users.noreply.github.com> Date: Sun, 22 Aug 2021 08:19:42 -0700 Subject: [PATCH] Add API to change EnderEye target without other nonsense (#6460) --- ...target-without-changing-other-things.patch | 28 ++++++++++ ...target-without-changing-other-things.patch | 54 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 patches/api/0330-Change-EnderEye-target-without-changing-other-things.patch create mode 100644 patches/server/0751-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0330-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0330-Change-EnderEye-target-without-changing-other-things.patch new file mode 100644 index 0000000000..d8e53593ae --- /dev/null +++ b/patches/api/0330-Change-EnderEye-target-without-changing-other-things.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sat, 21 Aug 2021 12:14:00 -0700 +Subject: [PATCH] Change EnderEye target without changing other things + + +diff --git a/src/main/java/org/bukkit/entity/EnderSignal.java b/src/main/java/org/bukkit/entity/EnderSignal.java +index 1bba155d80621852acd187e181423afc577899ea..c8c74651e1b434e5a0fce6d9e8d01754b2d7287a 100644 +--- a/src/main/java/org/bukkit/entity/EnderSignal.java ++++ b/src/main/java/org/bukkit/entity/EnderSignal.java +@@ -28,6 +28,17 @@ public interface EnderSignal extends Entity { + */ + public void setTargetLocation(@NotNull Location location); + ++ // Paper start ++ /** ++ * Set the {@link Location} this EnderSignal is moving towards. ++ * ++ * @param location the new target location ++ * @param update true to reset the {@link #getDropItem()} ++ * to a random value and {@link #getDespawnTimer()} to 0 ++ */ ++ public void setTargetLocation(@NotNull Location location, boolean update); ++ // Paper end ++ + /** + * Gets if the EnderSignal should drop an item on death.
+ * If {@code true}, it will drop an item. If {@code false}, it will shatter. diff --git a/patches/server/0751-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0751-Change-EnderEye-target-without-changing-other-things.patch new file mode 100644 index 0000000000..5f7821d0a6 --- /dev/null +++ b/patches/server/0751-Change-EnderEye-target-without-changing-other-things.patch @@ -0,0 +1,54 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sat, 21 Aug 2021 12:13:53 -0700 +Subject: [PATCH] Change EnderEye target without changing other things + + +diff --git a/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java b/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java +index 253c5d29452f4f75b9a94a74177c7adaa4a61978..27c81c21b76a6916abe5b334bc05b6edb47d151e 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java +@@ -75,6 +75,11 @@ public class EyeOfEnder extends Entity implements ItemSupplier { + } + + public void signalTo(BlockPos pos) { ++ // Paper start ++ this.signalTo(pos, true); ++ } ++ public void signalTo(BlockPos pos, boolean update) { ++ // Paper end + double d0 = (double) pos.getX(); + int i = pos.getY(); + double d1 = (double) pos.getZ(); +@@ -92,8 +97,10 @@ public class EyeOfEnder extends Entity implements ItemSupplier { + this.tz = d1; + } + ++ if (update) { // Paper + this.life = 0; + this.surviveAfterDeath = this.random.nextInt(5) > 0; ++ } // Paper + } + + @Override +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java +index 705dcae8f881cbdf5ff468f945b9269f9eae0e58..13c1188639e00cd96e00b179c4e353582bf66e64 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java +@@ -38,8 +38,15 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal { + + @Override + public void setTargetLocation(Location location) { ++ // Paper start ++ this.setTargetLocation(location, true); ++ } ++ ++ @Override ++ public void setTargetLocation(Location location, boolean update) { ++ // Paper end + Preconditions.checkArgument(getWorld().equals(location.getWorld()), "Cannot target EnderSignal across worlds"); +- this.getHandle().signalTo(new BlockPos(location.getX(), location.getY(), location.getZ())); ++ this.getHandle().signalTo(new BlockPos(location.getX(), location.getY(), location.getZ()), update); // Paper + } + + @Override