PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Spells should not affect bedrock. Fixes #103

Browse source
This commit is contained in:
Sollace 2023-03-05 16:37:04 +00:00
parent 0bcf2e7ada
commit 46cfa01a6a
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java
View file

@ -65,6 +65,10 @@ public interface Caster<E extends Entity> extends
default boolean canModifyAt(BlockPos pos, ModificationType mod) { default boolean canModifyAt(BlockPos pos, ModificationType mod) {
if (mod.checkPhysical()) { if (mod.checkPhysical()) {
if (asWorld().getBlockState(pos).getHardness(asWorld(), pos) < 0) {
return false;
}
if (getMaster() instanceof PlayerEntity player) { if (getMaster() instanceof PlayerEntity player) {
if (!asWorld().canPlayerModifyAt(player, pos)) { if (!asWorld().canPlayerModifyAt(player, pos)) {
return false; return false;

1
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java
View file

@ -12,6 +12,7 @@ import com.minelittlepony.unicopia.mixin.MixinFallingBlockEntity;
import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity;
import com.minelittlepony.unicopia.projectile.ProjectileDelegate; import com.minelittlepony.unicopia.projectile.ProjectileDelegate;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.FallingBlockEntity; import net.minecraft.entity.FallingBlockEntity;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.BlockHitResult;