mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
654b792caf
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 CraftBukkit Changes:a339310c#755: Fix NPE when calling getInventory() for virtual EnderChests2577f9bfIncrease outdated build delay1dabfdc8#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
32 lines
1.7 KiB
Diff
32 lines
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 f20283585464d54c4c5da294cf19261c2d258c97..c256fa48d64776ae7a7b21d42fb87c0a8ca7f3bc 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
@@ -224,6 +224,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
|
|
super.mobTick();
|
|
}
|
|
|
|
+ public final boolean teleportRandomly() { return this.eL(); } // Paper - OBFHELPER
|
|
protected boolean eL() {
|
|
if (!this.world.s_() && this.isAlive()) {
|
|
double d0 = this.locX() + (this.random.nextDouble() - 0.5D) * 64.0D;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
|
|
index 970efabd37d380ee1028c80a8e967e0f7aee9760..0c5f35934617529e92c02729687b524c3796128c 100644
|
|
--- 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);
|
|
}
|
|
|
|
+ @Override public boolean teleportRandomly() { return getHandle().teleportRandomly(); } // Paper
|
|
@Override
|
|
public MaterialData getCarriedMaterial() {
|
|
IBlockData blockData = getHandle().getCarried();
|