mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
41647af74c
We cannot put blocking network I/O onto the worldgen threads, this will crash the server if it stalls
33 lines
1.8 KiB
Diff
33 lines
1.8 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/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
|
index 8a44d518d15cddc70de2c90d8029dba50d75ca68..cd9233e700328835f0e1d4d32b8ed9671115f63f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
|
@@ -282,7 +282,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
|
super.customServerAiStep();
|
|
}
|
|
|
|
- protected boolean teleport() {
|
|
+ public boolean teleport() { // Paper - protected->public
|
|
if (!this.level.isClientSide() && this.isAlive()) {
|
|
double d0 = this.getX() + (this.random.nextDouble() - 0.5D) * 64.0D;
|
|
double d1 = this.getY() + (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 b72d7ade10075a13a617a370e2b8021326c9478d..ae669a970aa1f17ed786640de8a481364543c58e 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().teleport(); } // Paper
|
|
@Override
|
|
public MaterialData getCarriedMaterial() {
|
|
BlockState blockData = this.getHandle().getCarriedBlock();
|