Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-18 20:40:08 +01:00
Add API to change EnderEye target without other nonsense (#6460)
Dieser Commit ist enthalten in:
Ursprung
4b7fa94010
Commit
b37fbbca3d
@ -0,0 +1,28 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
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.<br>
|
||||||
|
* If {@code true}, it will drop an item. If {@code false}, it will shatter.
|
@ -0,0 +1,54 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
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
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren