Try to prevent potential stack overflow with drain handlers (#4291)

SlimeKnights · Apr 3, 2021 · c1a5ac1 · c1a5ac1
1 parent bf06b8f
commit c1a5ac1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/smeltery/tileentity/SmelteryInputOutputTileEntity.java b/src/main/java/slimeknights/tconstruct/smeltery/tileentity/SmelteryInputOutputTileEntity.java
@@ -59,11 +59,8 @@ protected void invalidateCaps() {
   protected void setMaster(@Nullable BlockPos master, @Nullable Block block) {
     assert world != null;
 
-    // invalidate handlers if the master changed
-    if (!Objects.equals(getMasterPos(), master)) {
-      clearHandler();
-      world.notifyNeighborsOfStateChange(pos, getBlockState().getBlock());
-    }
+    // keep track of master before it changed
+    boolean masterChanged = !Objects.equals(getMasterPos(), master);
     // update the master
     boolean hadMaster = getMasterPos() != null;
     super.setMaster(master, block);
@@ -72,6 +69,11 @@ protected void setMaster(@Nullable BlockPos master, @Nullable Block block) {
     if (hadMaster != hasMaster) {
       world.setBlockState(pos, getBlockState().with(SmelteryIOBlock.ACTIVE, hasMaster));
     }
+    // if we have a new master, invalidate handlers
+    if (masterChanged) {
+      clearHandler();
+      world.notifyNeighborsOfStateChange(pos, getBlockState().getBlock());
+    }
   }
 
   /**