mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-26 10:57:47 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
38 lines
1.8 KiB
Diff
38 lines
1.8 KiB
Diff
From dd92ca49c7d0e57a4962cda11cad24affab46e5b 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 77cf6b8e9b..9d9671eaec 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockIceFrost.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
|
|
@@ -25,6 +25,12 @@ public class BlockIceFrost extends BlockIce {
|
|
EnumDirection enumdirection = aenumdirection[j];
|
|
|
|
blockposition_b.j(blockposition).d(enumdirection);
|
|
+
|
|
+ // Paper start - Prevent Frosted Ice from loading/holding chunks
|
|
+ if (!world.isChunkLoaded(blockposition_b.getX() >> 4, blockposition_b.getZ() >> 4, true))
|
|
+ continue;
|
|
+ // Paper end - Prevent Frosted Ice from loading/holding chunks
|
|
+
|
|
IBlockData iblockdata1 = world.getType(blockposition_b);
|
|
|
|
if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition_b)) {
|
|
@@ -89,6 +95,10 @@ public class BlockIceFrost extends BlockIce {
|
|
EnumDirection enumdirection = aenumdirection[l];
|
|
|
|
blockposition_b.j(blockposition).d(enumdirection);
|
|
+ // Paper start - Prevent Frosted Ice from loading/holding chunks
|
|
+ if (!((World) iblockaccess).isChunkLoaded(blockposition_b.getX() >> 4, blockposition_b.getZ() >> 4, true))
|
|
+ continue;
|
|
+ // Paper end - Prevent Frosted Ice from loading/holding chunks
|
|
if (iblockaccess.getType(blockposition_b).getBlock() == this) {
|
|
++j;
|
|
if (j >= i) {
|
|
--
|
|
2.18.0
|
|
|