Merge branch '1.19' into 1.18

# Conflicts: # src/main/java/gripe/_90/aecapfix/mixin/powah/ForgeEnvHandlerMixin.java
62832 · Nov 3, 2023 · d8f86c3 · d8f86c3
2 parents acf7702 + 0875909
commit d8f86c3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/gripe/_90/aecapfix/mixin/powah/ForgeEnvHandlerMixin.java b/src/main/java/gripe/_90/aecapfix/mixin/powah/ForgeEnvHandlerMixin.java
@@ -41,13 +41,13 @@ private void registerCapabilities(AttachCapabilitiesEvent<BlockEntity> event, Ca
                 @NotNull
                 @Override
                 public <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) {
-                    if (reactorPart.core().isPresent() || cap == CapabilityEnergy.ENERGY && reactorPart.isExtractor()) {
-                        var holder = reactorPart.core().get().getCapability(cap, side);
-                        holders.add(holder.cast());
-                        return holder;
+                    if (reactorPart.core().isEmpty() || cap == CapabilityEnergy.ENERGY && !reactorPart.isExtractor()) {
+                        return LazyOptional.empty();
                     }
 
-                    return LazyOptional.empty();
+                    var holder = reactorPart.core().get().getCapability(cap, side);
+                    holders.add(holder.cast());
+                    return holder;
                 }
 
                 private void invalidate() {