Paper/patches/server/0196-Enderman.teleportRandomly.patch

33 lines
1.8 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 13:29:44 -0400
Subject: [PATCH] Enderman.teleportRandomly()
Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 8e8eea175e75f2a56a12bf1c23a5d22bf8047bb5..62717899cafaf5452e5bd5e665ecae38f3bd6a2b 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
2021-06-12 21:30:37 +02:00
@@ -277,7 +277,7 @@ public class EnderMan extends Monster implements NeutralMob {
2021-06-11 14:02:28 +02:00
super.customServerAiStep();
}
2021-06-12 21:30:37 +02:00
- protected boolean teleport() {
+ public boolean teleport() { // Paper - protected->public
2021-06-11 14:02:28 +02:00
if (!this.level.isClientSide() && this.isAlive()) {
double d0 = this.getX() + (this.random.nextDouble() - 0.5D) * 64.0D;
2021-06-12 21:30:37 +02:00
double d1 = this.getY() + (double) (this.random.nextInt(64) - 32);
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
2021-06-12 21:30:37 +02:00
index b72d7ade10075a13a617a370e2b8021326c9478d..ae669a970aa1f17ed786640de8a481364543c58e 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
@@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
super(server, entity);
}
2021-06-12 21:30:37 +02:00
+ @Override public boolean teleportRandomly() { return getHandle().teleport(); } // Paper
2021-06-11 14:02:28 +02:00
@Override
public MaterialData getCarriedMaterial() {
2021-06-12 21:30:37 +02:00
BlockState blockData = this.getHandle().getCarriedBlock();