Merge pull request #442 from jollycar/fix/ae2-conduid-crash

AE2 conduits crashes server on chunkload

Author: justliliandev

src/conduits/java/com/enderio/conduits/common/blockentity/ConduitBlockEntity.java

@@ -23,7 +23,6 @@
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.Mth;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Inventory;
@@ -116,10 +115,9 @@ public void onLoad() {
         updateShape();
         if (level instanceof ServerLevel serverLevel) {
             sync();
+            bundle.onLoad(level, getBlockPos());
             for (var entry: lazyNodes.entrySet()) {
                 NodeIdentifier<?> node = entry.getValue();
-                IExtendedConduitData<?> data = node.getExtendedConduitData();
-                data.onCreated(entry.getKey(), level, worldPosition, null);
                 for (Direction dir : Direction.values()) {
                     tryConnectTo(dir, entry.getKey(), false, false).ifPresent(otherNode -> Graph.connect(node, otherNode));
                 }
@@ -130,7 +128,6 @@ public void onLoad() {
                 }
                 ConduitSavedData.addPotentialGraph(entry.getKey(), Objects.requireNonNull(node.getGraph()), serverLevel);
             }
-            bundle.onLoad(level, getBlockPos());
         }
     }
 

src/conduits/java/com/enderio/conduits/common/integrations/ae2/AE2InWorldConduitNodeHost.java

@@ -64,7 +64,7 @@ public void onCreated(IConduitType<?> type, Level level, BlockPos pos, @Nullable
             if (player != null) {
                 mainNode.setOwningPlayer(player);
             }
-            mainNode.create(level, pos);
+            GridHelper.onFirstTick(level.getBlockEntity(pos), blockEntity -> mainNode.create(level, pos));
         }
     }