Skip to content

Commit 5338cca

Browse files
committed
Adjust patch for 1.18 FlagManager
1 parent aa50c44 commit 5338cca

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.spongepowered.asm.mixin.injection.Coerce;
88
import org.spongepowered.asm.mixin.injection.Redirect;
99

10-
import java.util.function.BooleanSupplier;
10+
import java.util.function.Supplier;
1111

1212
/**
1313
* Fix getOrCreateFlag accessing the FLAGS map without synchronization by wrapping all calls to it
@@ -18,15 +18,15 @@
1818
@RequiresMod("cofh_core")
1919
public class FlagManagerMixin {
2020
@Shadow @Final
21-
private static Object2ObjectOpenHashMap<String, BooleanSupplier> FLAGS;
21+
private static Object2ObjectOpenHashMap<String, Supplier<Boolean>> FLAGS;
2222

2323
@Shadow
24-
private BooleanSupplier getOrCreateFlag(String flag) {
24+
private Supplier<Boolean> getOrCreateFlag(String flag) {
2525
throw new AssertionError();
2626
}
2727

2828
@Redirect(method = "*", at = @At(value = "INVOKE", target = "getOrCreateFlag"), require = 0)
29-
private BooleanSupplier getFlag(@Coerce Object flagHandler, String flag) {
29+
private Supplier<Boolean> getFlag(@Coerce Object flagHandler, String flag) {
3030
if(flagHandler != this)
3131
throw new AssertionError("Redirect targeted bad getOrCreateFlag invocation");
3232
synchronized (FLAGS) {

0 commit comments

Comments
 (0)