correct boolean logic in mapwriter

rfresh2 · Dec 17, 2023 · 83c4800 · 83c4800
1 parent 049325f
commit 83c4800
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/xaeroplus/mixin/client/MixinMapWriter.java b/src/main/java/xaeroplus/mixin/client/MixinMapWriter.java
@@ -91,14 +91,17 @@ public void obsidianRoofHeadInject(final World world, final Registry<Block> bloc
         }
     }
 
+    // What we want: a = !b && !c
+    // But we're wrapping b
+    // so instead we do a = !(b || c)
     @WrapOperation(method = "loadPixel", at = @At(
         value = "INVOKE",
         target = "Lxaero/map/region/OverlayBuilder;isEmpty()Z"
     ), remap = true)
     public boolean checkObsidianRoofColumn(final OverlayBuilder instance, final Operation<Boolean> original,
                                            @Share("columnRoofObsidian") final LocalBooleanRef columnRoofObsidianRef) {
         if (!XaeroPlusSettingRegistry.transparentObsidianRoofSetting.getValue()) return original.call(instance);
-        return original.call(instance) && !columnRoofObsidianRef.get();
+        return original.call(instance) || columnRoofObsidianRef.get();
     }
 
     @ModifyExpressionValue(method = "loadPixelHelp", at = @At(