PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-08 06:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix changeling climbing on ladders and scaffolding #248

Browse source
This commit is contained in:
Sollace 2024-02-07 10:55:51 +00:00
parent 8d736befa5
commit 2b2fab2303
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/minelittlepony/unicopia/entity/player/Acrobatics.java
View file

@ -12,12 +12,14 @@ import com.minelittlepony.unicopia.util.NbtSerialisable;
import com.minelittlepony.unicopia.util.Tickable;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.SideShapeType;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.entity.data.TrackedData;
import net.minecraft.entity.data.TrackedDataHandlerRegistry;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.minecraft.util.math.BlockPos;
@ -62,7 +64,8 @@ public class Acrobatics implements Tickable, NbtSerialisable {
if (!pony.getPhysics().isFlying() && !entity.getAbilities().flying
&& climbingPos != null
&& pony.getObservedSpecies() == Race.CHANGELING) {
&& pony.getObservedSpecies() == Race.CHANGELING
&& !entity.getBlockStateAtPos().isIn(BlockTags.CLIMBABLE)) {
Vec3d vel = entity.getVelocity();
if (entity.isSneaking()) {
entity.setVelocity(vel.x, 0, vel.z);
@ -138,7 +141,8 @@ public class Acrobatics implements Tickable, NbtSerialisable {
boolean isFaceClimbable(World world, BlockPos pos, Direction direction) {
pos = pos.offset(direction);
return world.getBlockState(pos).isSideSolid(world, pos, direction, SideShapeType.CENTER);
BlockState state = world.getBlockState(pos);
return !state.isOf(Blocks.SCAFFOLDING) && state.isSideSolid(world, pos, direction, SideShapeType.CENTER);
}
public Optional<BlockPos> getHangingPosition() {