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

# Conflicts: # src/main/java/appeng/tile/grid/AENetworkInvBlockEntity.java
2020-08-24 23:55:41 +02:00
parent 359e3f7e63 1394ab0863
commit d2b69671f5
1 changed files with 4 additions and 0 deletions
@@ -80,6 +80,10 @@ public abstract class AENetworkInvBlockEntity extends AEBaseInvBlockEntity imple
    @Override
    public void markRemoved() {
        super.markRemoved();
+        // if the cached block state is not current, the following method may call
+        // markForUpdate
+        // and cause the block state to be changed back to non-air
+        resetBlock();
        this.getProxy().remove();
    }