R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust patch for 1.18 FlagManager

Browse Source
This commit is contained in:
embeddedt 2023-07-24 14:19:02 -04:00
parent aa50c4466e
commit 5338cca79b
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Coerce;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
/**
* Fix getOrCreateFlag accessing the FLAGS map without synchronization by wrapping all calls to it
@ -18,15 +18,15 @@ import java.util.function.BooleanSupplier;
@RequiresMod("cofh_core")
public class FlagManagerMixin {
@Shadow @Final
private static Object2ObjectOpenHashMap<String, BooleanSupplier> FLAGS;
private static Object2ObjectOpenHashMap<String, Supplier<Boolean>> FLAGS;
@Shadow
private BooleanSupplier getOrCreateFlag(String flag) {
private Supplier<Boolean> getOrCreateFlag(String flag) {
throw new AssertionError();
}
@Redirect(method = "*", at = @At(value = "INVOKE", target = "getOrCreateFlag"), require = 0)
private BooleanSupplier getFlag(@Coerce Object flagHandler, String flag) {
private Supplier<Boolean> getFlag(@Coerce Object flagHandler, String flag) {
if(flagHandler != this)
throw new AssertionError("Redirect targeted bad getOrCreateFlag invocation");
synchronized (FLAGS) {