diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index c93b4d5c..c1bdb578 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -36,6 +36,7 @@ public interface UTags { TagKey GLASS_BLOCKS = block("glass_blocks"); TagKey FRAGILE = block("fragile"); TagKey INTERESTING = block("interesting"); + TagKey CATAPULT_IMMUNE = block("catapult_immune"); TagKey CRYSTAL_HEART_BASE = block("crystal_heart_base"); TagKey CRYSTAL_HEART_ORNAMENT = block("crystal_heart_ornament"); diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java index 092218cd..c72a69d1 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java @@ -4,6 +4,7 @@ import java.util.function.Consumer; import org.jetbrains.annotations.Nullable; +import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.Situation; import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; @@ -12,6 +13,7 @@ import com.minelittlepony.unicopia.mixin.MixinFallingBlockEntity; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.FallingBlockEntity; import net.minecraft.util.hit.BlockHitResult; @@ -82,6 +84,11 @@ public class CatapultSpell extends AbstractSpell implements ProjectileDelegate.B return; } + BlockState state = world.getBlockState(bpos); + if (state.isIn(UTags.CATAPULT_IMMUNE)) { + return; + } + Vec3d pos = Vec3d.ofBottomCenter(bpos); FallingBlockEntity e = MixinFallingBlockEntity.createInstance(world, pos.x, pos.y, pos.z, world.getBlockState(bpos)); world.removeBlock(bpos, true); diff --git a/src/main/resources/data/unicopia/tags/blocks/catapult_immune.json b/src/main/resources/data/unicopia/tags/blocks/catapult_immune.json new file mode 100644 index 00000000..7b7efde0 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/blocks/catapult_immune.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:bedrock", + "#minecraft:doors" + ] +}