Skip to content

Commit 5ef3a65

Browse files
committed
fix cactus not dealing any damage
1 parent 87e3792 commit 5ef3a65

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/main/java/teamport/aether/mixin/block/CactusSpikeImmunitiesMixin.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
11
package teamport.aether.mixin.block;
22

3-
import com.llamalad7.mixinextras.expression.Definition;
4-
import com.llamalad7.mixinextras.expression.Expression;
5-
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
63
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
74
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
85
import net.minecraft.core.block.BlockLogicCactus;
96
import net.minecraft.core.entity.Entity;
10-
import net.minecraft.core.entity.Mob;
117
import net.minecraft.core.util.helper.DamageType;
12-
import net.minecraft.core.world.World;
138
import org.spongepowered.asm.mixin.Mixin;
149
import org.spongepowered.asm.mixin.injection.At;
1510
import teamport.aether.entity.AetherMobOtherImmunities;
1611

1712
@Mixin(value = BlockLogicCactus.class, remap = false)
1813
public abstract class CactusSpikeImmunitiesMixin {
19-
@Definition(id = "Mob", type = {Mob.class})
20-
@Expression("? instanceof Mob")
21-
@ModifyExpressionValue(method = "onEntityCollidedWithBlock", at = @At("MIXINEXTRAS:EXPRESSION"))
22-
private boolean monsterImmuneToSpikeOne(boolean original, World world, int x, int y, int z, Entity entity) {
23-
return original && entity instanceof AetherMobOtherImmunities;
24-
}
2514
@WrapOperation(method = "onEntityCollidedWithBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/entity/Entity;hurt(Lnet/minecraft/core/entity/Entity;ILnet/minecraft/core/util/helper/DamageType;)Z"))
2615
private boolean monsterImmuneToSpikes(Entity instance, Entity attacker, int baseDamage, DamageType type, Operation<Boolean> original) {
2716
if (!(instance instanceof AetherMobOtherImmunities)) return original.call(instance, attacker, baseDamage, type);

0 commit comments

Comments
 (0)