mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
0a953a924a
This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
32 lines
No EOL
1.7 KiB
Diff
32 lines
No EOL
1.7 KiB
Diff
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/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
index e8ea231dc..4f8dd320f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
@@ -0,0 +0,0 @@ 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
|
|
@@ -0,0 +0,0 @@ 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));
|
|
--
|