Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mixin conflict with lets do meadow (#1149)

Browse Source
This commit is contained in:
IzzelAliz 2023-12-10 22:08:29 +08:00
parent 01494721f1
commit 5e70607eb2
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/projectile/ThrownEggMixin.java
View File

@ -3,8 +3,10 @@ package io.izzel.arclight.common.mixin.core.world.entity.projectile;
import io.izzel.arclight.common.bridge.core.entity.EntityBridge; import io.izzel.arclight.common.bridge.core.entity.EntityBridge;
import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
import io.izzel.arclight.common.bridge.core.world.WorldBridge; import io.izzel.arclight.common.bridge.core.world.WorldBridge;
import io.izzel.arclight.common.mod.util.Blackhole;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.animal.Chicken;
import net.minecraft.world.entity.projectile.ThrownEgg; import net.minecraft.world.entity.projectile.ThrownEgg;
import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -47,6 +49,11 @@ public abstract class ThrownEggMixin extends ThrowableProjectileMixin {
if (hatching) { if (hatching) {
for (int i = 0; i < b0; ++i) { for (int i = 0; i < b0; ++i) {
Entity entity = ((WorldBridge) this.level()).bridge$getWorld().createEntity(new Location(((WorldBridge) this.level()).bridge$getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0f), hatchingType.getEntityClass()); Entity entity = ((WorldBridge) this.level()).bridge$getWorld().createEntity(new Location(((WorldBridge) this.level()).bridge$getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0f), hatchingType.getEntityClass());
// Let's do: Meadow mixin compatibility https://github.com/IzzelAliz/Arclight/issues/1149
if (entity instanceof Chicken) {
Chicken chicken = (Chicken) entity;
Blackhole.consume(chicken);
}
if (entity != null) { if (entity != null) {
if (((EntityBridge) entity).bridge$getBukkitEntity() instanceof Ageable) { if (((EntityBridge) entity).bridge$getBukkitEntity() instanceof Ageable) {
((Ageable) ((EntityBridge) entity).bridge$getBukkitEntity()).setBaby(); ((Ageable) ((EntityBridge) entity).bridge$getBukkitEntity()).setBaby();

7
arclight-common/src/main/java/io/izzel/arclight/common/mod/util/Blackhole.java Normal file
View File

@ -0,0 +1,7 @@
package io.izzel.arclight.common.mod.util;
public class Blackhole {
public static void consume(Object o) {
}
}