mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 01:12:47 +01:00
31 lines
2.1 KiB
Diff
31 lines
2.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||
|
|
Date: Tue, 18 Dec 2018 02:15:08 +0000
|
||
|
|
Subject: [PATCH] Prevent Enderman from loading chunks
|
||
|
|
|
||
|
|
|
||
|
|
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 d190b58bea310f4006ea3deaf0d42c502d441284..dae35d3f758e40c1edf31b11c6e11f1b7bb2dfae 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||
|
|
@@ -434,7 +434,8 @@ public class EnderMan extends Monster implements NeutralMob {
|
||
|
|
int j = Mth.floor(this.enderman.getY() + random.nextDouble() * 3.0D);
|
||
|
|
int k = Mth.floor(this.enderman.getZ() - 2.0D + random.nextDouble() * 4.0D);
|
||
|
|
BlockPos blockposition = new BlockPos(i, j, k);
|
||
|
|
- BlockState iblockdata = world.getBlockState(blockposition);
|
||
|
|
+ BlockState iblockdata = world.getTypeIfLoaded(blockposition); // Paper
|
||
|
|
+ if (iblockdata == null) return; // Paper
|
||
|
|
Block block = iblockdata.getBlock();
|
||
|
|
Vec3 vec3d = new Vec3((double) Mth.floor(this.enderman.getX()) + 0.5D, (double) j + 0.5D, (double) Mth.floor(this.enderman.getZ()) + 0.5D);
|
||
|
|
Vec3 vec3d1 = new Vec3((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D);
|
||
|
|
@@ -474,7 +475,8 @@ public class EnderMan extends Monster implements NeutralMob {
|
||
|
|
int j = Mth.floor(this.enderman.getY() + random.nextDouble() * 2.0D);
|
||
|
|
int k = Mth.floor(this.enderman.getZ() - 1.0D + random.nextDouble() * 2.0D);
|
||
|
|
BlockPos blockposition = new BlockPos(i, j, k);
|
||
|
|
- BlockState iblockdata = world.getBlockState(blockposition);
|
||
|
|
+ BlockState iblockdata = world.getTypeIfLoaded(blockposition); // Paper
|
||
|
|
+ if (iblockdata == null) return; // Paper
|
||
|
|
BlockPos blockposition1 = blockposition.below();
|
||
|
|
BlockState iblockdata1 = world.getBlockState(blockposition1);
|
||
|
|
BlockState iblockdata2 = this.enderman.getCarriedBlock();
|