geforkt von Mirrors/Paper
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
55 Zeilen
2.3 KiB
Diff
55 Zeilen
2.3 KiB
Diff
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 ee6bbe96503e9205349e9a5c411dc60dd952ec9e..e48706e2fefc39fcce3c65f629153fdcd677044c 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
|
|
@@ -70,6 +70,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();
|
|
@@ -87,8 +92,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 d4dfc7a0266086b9bf2c3966c6e149453d0583ba..1fb5760681bf0c745f9f3517489a83666a6d6805 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
|
|
@@ -32,8 +32,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(this.getWorld().equals(location.getWorld()), "Cannot target EnderSignal across worlds");
|
|
- this.getHandle().signalTo(CraftLocation.toBlockPosition(location));
|
|
+ this.getHandle().signalTo(CraftLocation.toBlockPosition(location), update); // Paper
|
|
}
|
|
|
|
@Override
|