diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java index e9a1ddec..465e2fa2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/RecipeIteratorMixin.java @@ -22,11 +22,19 @@ public class RecipeIteratorMixin { @Shadow @Final private Iterator, Map>>> recipes; // @formatter:on + /** + * @author IzzelAliz + * @reason + */ @Overwrite public boolean hasNext() { return (current != null && current.hasNext()) || recipes.hasNext(); } + /** + * @author IzzelAliz + * @reason + */ @Overwrite public Recipe next() { if (current == null || !current.hasNext()) { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieEntityMixin.java index 58639d0e..d45ee0c0 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/monster/ZombieEntityMixin.java @@ -68,7 +68,9 @@ public abstract class ZombieEntityMixin extends CreatureEntityMixin { @Eject(method = "onKillEntity", at = @At(value = "INVOKE", remap = false, target = "Lnet/minecraft/entity/merchant/villager/VillagerEntity;func_233656_b_(Lnet/minecraft/entity/EntityType;Z)Lnet/minecraft/entity/MobEntity;")) private T arclight$transform(VillagerEntity villagerEntity, EntityType entityType, boolean flag, CallbackInfo ci) { - T t = this.a(entityType, flag, EntityTransformEvent.TransformReason.INFECTION, CreatureSpawnEvent.SpawnReason.INFECTION); + ((WorldBridge) villagerEntity.world).bridge$pushAddEntityReason(CreatureSpawnEvent.SpawnReason.INFECTION); + ((MobEntityBridge) villagerEntity).bridge$pushTransformReason(EntityTransformEvent.TransformReason.INFECTION); + T t = villagerEntity.func_233656_b_(entityType, flag); if (t == null) { ci.cancel(); }