From c195cd6bbbdd48dc8aea21f3a50465a5c19247c7 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Sat, 13 Apr 2019 11:54:40 +0800 Subject: [PATCH] null pointer fix for #5388 --- src/main/java/mekanism/common/multiblock/SynchronizedData.java | 2 ++ src/main/java/mekanism/common/tile/TileEntityMultiblock.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index bc023dd9a..ba5dcc940 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -2,6 +2,7 @@ package mekanism.common.multiblock; import java.util.HashSet; import java.util.Set; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -24,6 +25,7 @@ public abstract class SynchronizedData> { public boolean hasRenderer; + @Nullable//may be null if structure has not been fully sent public Coord4D renderLocation; public Coord4D minLocation; diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index e9b95308c..43d2a2dd3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -77,7 +77,7 @@ public abstract class TileEntityMultiblock> extend structure = getNewStructure(); } - if (structure != null && clientHasStructure && isRendering) { + if (structure != null && structure.renderLocation != null && clientHasStructure && isRendering) { if (!prevStructure) { Mekanism.proxy.doMultiblockSparkle(this, structure.renderLocation.getPos(), structure.volLength, structure.volWidth, structure.volHeight, tile -> MultiblockManager.areEqual(this, tile));