mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 13:06:02 +01:00
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
|
From 54a0c28176774e984ea077500e21a0b8a7c12e54 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/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
|
||
|
|
index 7b1fb6b7b..3038a9e2b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
||
|
|
@@ -198,6 +198,7 @@ public class EntityEnderman extends EntityMonster {
|
||
|
|
super.M();
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public boolean teleportRandomly() { return dm(); } // Paper - OBFHELPER
|
||
|
|
protected boolean dm() {
|
||
|
|
double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
|
||
|
|
double d1 = this.locY + (double) (this.random.nextInt(64) - 32);
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
|
||
|
|
index f602c2313..7e6af5d02 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
|
||
|
|
@@ -15,6 +15,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
|
||
|
|
super(server, entity);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ @Override public boolean teleportRandomly() { return getHandle().teleportRandomly(); } // Paper
|
||
|
|
public MaterialData getCarriedMaterial() {
|
||
|
|
IBlockData blockData = getHandle().getCarried();
|
||
|
|
return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData.getBlock()).getNewData((byte) blockData.getBlock().toLegacyData(blockData));
|
||
|
|
--
|
||
|
|
2.17.0
|
||
|
|
|