Skip to content

fix cactus not dealing any damage #815

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

Merged
LukeisStuff merged 1 commit into from
Jan 21, 2026
Merged

fix cactus not dealing any damage #815

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
11 changes: 0 additions & 11 deletions src/main/java/teamport/aether/mixin/block/CactusSpikeImmunitiesMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,16 @@
package teamport.aether.mixin.block;

import com.llamalad7.mixinextras.expression.Definition;
import com.llamalad7.mixinextras.expression.Expression;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.minecraft.core.block.BlockLogicCactus;
import net.minecraft.core.entity.Entity;
import net.minecraft.core.entity.Mob;
import net.minecraft.core.util.helper.DamageType;
import net.minecraft.core.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import teamport.aether.entity.AetherMobOtherImmunities;

@Mixin(value = BlockLogicCactus.class, remap = false)
public abstract class CactusSpikeImmunitiesMixin {
@Definition(id = "Mob", type = {Mob.class})
@Expression("? instanceof Mob")
@ModifyExpressionValue(method = "onEntityCollidedWithBlock", at = @At("MIXINEXTRAS:EXPRESSION"))
private boolean monsterImmuneToSpikeOne(boolean original, World world, int x, int y, int z, Entity entity) {
return original && entity instanceof AetherMobOtherImmunities;
}
@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"))
private boolean monsterImmuneToSpikes(Entity instance, Entity attacker, int baseDamage, DamageType type, Operation<Boolean> original) {
if (!(instance instanceof AetherMobOtherImmunities)) return original.call(instance, attacker, baseDamage, type);
Expand Down
Loading