From a5045bfc0f3e9b93e61841c22ffc68cdb6c12177 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Fri, 8 Jun 2018 00:52:00 +0200 Subject: [PATCH] try to limit nbttag compound on apiaries to 128 entries --- src/main/java/forestry/apiculture/BeekeepingLogic.java | 8 ++++++-- .../forestry/apiculture/multiblock/AlvearyController.java | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index e001fddfe..d666ba107 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -116,9 +116,13 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { hasFlowersCache.writeToNBT(nbttagcompound); Stack spawnCopy = new Stack<>(); - spawnCopy.addAll(spawn); + if (spawn.size()<128) + spawnCopy.addAll(spawn); + else + for (byte b=0;b<128;++b) + spawnCopy.add(spawn.get(b)); NBTTagList nbttaglist = new NBTTagList(); - while (!spawnCopy.isEmpty()) { + while (!spawnCopy.isEmpty() && spawnCopy.size()<=128) { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); spawnCopy.pop().writeToNBT(nbttagcompound1); nbttaglist.appendTag(nbttagcompound1); diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 940793a4d..8bce6c0ef 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -290,7 +290,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple data.setFloat("TempChange", tempChange); data.setFloat("HumidChange", humidChange); - beekeepingLogic.writeToNBT(data); inventory.writeToNBT(data); }