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

# Conflicts: # build.gradle # core/src/main/java/appeng/block/AEBaseBlock.java # core/src/main/java/appeng/block/misc/TinyTNTBlock.java # core/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java # core/src/main/java/appeng/fluids/util/AEFluidStack.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/core/api/definitions/ApiItems.java # src/main/java/appeng/debug/EnergyGeneratorBlockEntity.java # src/main/java/appeng/entity/TinyTNTPrimedEntity.java # src/main/java/appeng/tile/storage/DriveBlockEntity.java
2020-06-29 21:33:44 +02:00
parent ca104912d6 7233b11284
commit 3337eb9ae3
22 changed files with 314 additions and 125 deletions
@@ -65,6 +65,9 @@ public class EnergyGeneratorBlockEntity extends AEBaseBlockEntity implements Tic

        for (Direction facing : Direction.values()) {
            final BlockEntity te = this.getWorld().getBlockEntity(this.getPos().offset(facing));
+            if (te == null) {
+                continue;
+            }
            final LazyOptional<IEnergyStorage> cap = te.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite());

            cap.ifPresent(consumer -> {