Merge remote-tracking branch 'origin/master' into fabric/master

# Conflicts: # gradle.properties # src/api/java/appeng/api/implementations/items/IGrowableCrystal.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/core/api/definitions/ApiBlocks.java # src/main/java/appeng/core/features/registries/LocatableRegistry.java # src/main/java/appeng/decorative/solid/QuartzGlassBlock.java # src/main/java/appeng/decorative/solid/SkyStoneBlock.java # src/main/java/appeng/entity/GrowingCrystalEntity.java # src/main/java/appeng/fluids/parts/FluidImportBusPart.java # src/main/java/appeng/items/misc/CrystalSeedItem.java # src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java # src/main/java/appeng/me/cluster/implementations/QuantumCluster.java # src/main/java/appeng/parts/CableBusContainer.java # src/main/java/appeng/tile/AEBaseBlockEntity.java
2020-09-09 01:41:49 +02:00
parent ca007a3737 9e41d543f5
commit fcbebd4ffc
15 changed files with 306 additions and 1159 deletions
@@ -250,7 +250,7 @@ public class AEBaseBlockEntity extends BlockEntity implements IOrientable, IComm
            this.renderFragment |= 1;
        } else {
            // TODO: Optimize Network Load
-            if (this.world != null) {
+            if (this.world != null && !this.isRemoved() && !notLoaded()) {
                boolean alreadyUpdated = false;
                // Let the block update it's own state with our internal state changes
                BlockState currentState = getCachedState();