Fix villager stock resetting (#618)
This commit is contained in:
parent
999b9bb30e
commit
426e163726
|
@ -1,5 +1,6 @@
|
||||||
package io.izzel.arclight.common.mixin.core.world.entity.npc;
|
package io.izzel.arclight.common.mixin.core.world.entity.npc;
|
||||||
|
|
||||||
|
import io.izzel.arclight.common.bridge.core.item.MerchantOfferBridge;
|
||||||
import io.izzel.arclight.common.bridge.core.world.WorldBridge;
|
import io.izzel.arclight.common.bridge.core.world.WorldBridge;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.world.entity.LightningBolt;
|
import net.minecraft.world.entity.LightningBolt;
|
||||||
|
@ -20,7 +21,6 @@ import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||||
import io.izzel.arclight.common.bridge.core.item.MerchantOfferBridge;
|
|
||||||
|
|
||||||
@Mixin(net.minecraft.world.entity.npc.Villager.class)
|
@Mixin(net.minecraft.world.entity.npc.Villager.class)
|
||||||
public abstract class VillagerMixin extends AbstractVillagerMixin {
|
public abstract class VillagerMixin extends AbstractVillagerMixin {
|
||||||
|
@ -39,12 +39,12 @@ public abstract class VillagerMixin extends AbstractVillagerMixin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Redirect(method = "updateSpecialPrices", at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/world/item/trading/MerchantOffer;addToSpecialPriceDiff(I)V"))
|
@Redirect(method = "catchUpDemand", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/trading/MerchantOffer;resetUses()V"))
|
||||||
private void arclight$replenish(MerchantOffer merchantOffer, int add) {
|
private void arclight$replenish(MerchantOffer instance) {
|
||||||
VillagerReplenishTradeEvent event = new VillagerReplenishTradeEvent((Villager) this.getBukkitEntity(), ((MerchantOfferBridge) merchantOffer).bridge$asBukkit());
|
VillagerReplenishTradeEvent event = new VillagerReplenishTradeEvent((Villager) this.getBukkitEntity(), ((MerchantOfferBridge) instance).bridge$asBukkit());
|
||||||
Bukkit.getPluginManager().callEvent(event);
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
if (!event.isCancelled()) {
|
if (!event.isCancelled()) {
|
||||||
merchantOffer.resetUses();
|
instance.resetUses();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user