32 lines
2 KiB
Diff
32 lines
2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Sat, 10 Mar 2018 16:33:15 -0500
|
||
|
|
Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
|
||
|
|
index 061b157f66999a733c3c4e990371b6f8d7860de2..77f5f835c60c181a0a2d6fc782d756338bc2ccb0 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/BlockIceFrost.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
|
||
|
|
@@ -28,7 +28,8 @@ public class BlockIceFrost extends BlockIce {
|
||
|
|
EnumDirection enumdirection = aenumdirection[j];
|
||
|
|
|
||
|
|
blockposition_mutableblockposition.a((BaseBlockPosition) blockposition, enumdirection);
|
||
|
|
- IBlockData iblockdata1 = worldserver.getType(blockposition_mutableblockposition);
|
||
|
|
+ IBlockData iblockdata1 = worldserver.getTypeIfLoaded(blockposition_mutableblockposition); // Paper
|
||
|
|
+ if (iblockdata1 == null) { continue; } // Paper
|
||
|
|
|
||
|
|
if (iblockdata1.a((Block) this) && !this.e(iblockdata1, (World) worldserver, blockposition_mutableblockposition)) {
|
||
|
|
worldserver.getBlockTickList().a(blockposition_mutableblockposition, this, MathHelper.nextInt(random, worldserver.paperConfig.frostedIceDelayMin, worldserver.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
|
||
|
|
@@ -71,7 +72,9 @@ public class BlockIceFrost extends BlockIce {
|
||
|
|
EnumDirection enumdirection = aenumdirection[l];
|
||
|
|
|
||
|
|
blockposition_mutableblockposition.a((BaseBlockPosition) blockposition, enumdirection);
|
||
|
|
- if (iblockaccess.getType(blockposition_mutableblockposition).a((Block) this)) {
|
||
|
|
+ // Paper start
|
||
|
|
+ IBlockData type = iblockaccess.getTypeIfLoaded(blockposition_mutableblockposition);
|
||
|
|
+ if (type != null && type.a((Block) this)) { // Paper end
|
||
|
|
++j;
|
||
|
|
if (j >= i) {
|
||
|
|
return false;
|