mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
fb25dc17c6
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes:a46fdbc6Remove outdated build delay.3697519bSPIGOT-4708: Fix ExactChoice recipes neglecting material9ead7009SPIGOT-4677: Add minecraft.admin.command_feedback permissionc3749a23Remove the Damage tag from items when it is 0.f74c7b95SPIGOT-4706: Can't interact with active item494eef45Mention requirement of JIRA ticket for bug fixes51d62decSPIGOT-4702: Exception when middle clicking certain slotsbe557e69SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
From d92790d85799f57bd6f30b8eed5589b289935287 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 8949529e67..233568cc12 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
@@ -176,6 +176,7 @@ public class EntityEnderman extends EntityMonster {
|
|
super.mobTick();
|
|
}
|
|
|
|
+ public boolean teleportRandomly() { return dz(); } // Paper - OBFHELPER
|
|
protected boolean dz() {
|
|
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 b81693d9ff..9bc6a6c0c1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
|
|
@@ -17,6 +17,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);
|
|
--
|
|
2.21.0
|
|
|