Skip to content

create lazy supplier for cures to fix early holder access crashes #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.21.1
Choose a base branch
from
Open

create lazy supplier for cures to fix early holder access crashes #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions .../github/fabricators_of_create/porting_lib/entity/mixin/common/MobEffectInstanceMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.github.fabricators_of_create.porting_lib.entity.mixin.common;

import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.collect.Sets;

import com.llamalad7.mixinextras.injector.ModifyReturnValue;
Expand Down Expand Up @@ -30,25 +32,17 @@ public class MobEffectInstanceMixin implements MobEffectInstanceInjection {
private Holder<MobEffect> effect;

@Unique
private final Set<EffectCure> porting_lib$cures = Sets.newIdentityHashSet();
private final Supplier<Set<EffectCure>> porting_lib$cures = Suppliers.memoize(() -> {
var set = Sets.<EffectCure>newIdentityHashSet();
this.effect.value().fillEffectCures(set, MixinHelper.cast(this));
return set;
});

/**
* {@return the {@link EffectCure}s which can cure the {@link MobEffect} held by this {@link MobEffectInstance}}
*/
public Set<EffectCure> getCures() {
return porting_lib$cures;
}

@Inject(method = "<init>(Lnet/minecraft/core/Holder;IIZZZLnet/minecraft/world/effect/MobEffectInstance;)V", at = @At("TAIL"))
private void addEffects(Holder<MobEffect> holder, int duration, int amplifier, boolean ambient, boolean visible, boolean showIcon, MobEffectInstance hiddenEffect, CallbackInfo ci) {
this.effect.value().fillEffectCures(this.porting_lib$cures, MixinHelper.cast(this));
}

@Inject(method = "<init>(Lnet/minecraft/core/Holder;Lnet/minecraft/world/effect/MobEffectInstance$Details;)V", at = @At("TAIL"))
private void loadEffects(Holder<MobEffect> effect, MobEffectInstance.Details details, CallbackInfo ci) {
Set<EffectCure> cures = getCures();
cures.clear();
((MobEffectInstance$DetailsInjection) (Object) details).port_lib$getCures().ifPresent(cures::addAll);
return porting_lib$cures.get();
}

@ModifyReturnValue(method = "asDetails", at = @At("RETURN"))
Expand Down