mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 27561c26a78ebee8146b8e4f040496bddde42e64 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sat, 22 Jul 2017 15:22:59 +0100
|
|
Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
|
|
to avoid exeptions when calling getTileEntity
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index f9b4f314ce..65fe50882b 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -234,6 +234,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
result = fixTileEntity(pos, type, result);
|
|
}
|
|
}
|
|
+ // Paper Start - add TE fix checks for shulkers, see nms.BlockShulkerBox
|
|
+ else if (type instanceof BlockShulkerBox) {
|
|
+ if (!(result instanceof TileEntityShulkerBox)) {
|
|
+ result = fixTileEntity(pos, type, result);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
|
|
return result;
|
|
}
|
|
--
|
|
2.19.0
|
|
|