mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 05:54:43 +01:00
899bc53b79
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: f47abd88 SPIGOT-6242: Fix some file line endings de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable CraftBukkit Changes: 4475707d SPIGOT-6244: /spawnpoint ignores angle 8b3b096d SPIGOT-6242: Fix some file line endings 4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent results in a "Unable to summon entity due to duplicate UUIDs" error 2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change
31 lines
1.7 KiB
Diff
31 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 b9ede7d533a813f4de27404dc14b0ef99c8fcd62..1e7aa2ee1c399bf3484e0245d57ab428d48d32f5 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();
|