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

Add a fix for floating pegasi.

Browse source
This commit is contained in:
Sollace 2019-07-22 20:07:11 +02:00
parent 4709e45d62
commit 73db95a777
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/com/minelittlepony/client/pony/Pony.java
View file

@ -8,7 +8,10 @@ import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.pony.meta.Size;
import net.minecraft.block.BlockState;
import net.minecraft.block.Material;
import net.minecraft.block.StairsBlock;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EquipmentSlot;
@ -70,13 +73,39 @@ public class Pony implements IPony {
@Override
public boolean isFlying(LivingEntity entity) {
return !(entity.onGround
return !(isOnGround(entity)
|| entity.hasVehicle()
|| (entity.isClimbing() && !(entity instanceof PlayerEntity && ((PlayerEntity)entity).abilities.allowFlying))
|| entity.isInWater()
|| entity.isSleeping());
}
/**
* Checks if the entity is on the ground, or close enough to be "effectively" grounded.
* this is to keep Pegasus wings from flapping in odd situations (Hypixel).
*/
private boolean isOnGround(LivingEntity entity) {
if (entity.onGround) {
return true;
}
BlockState below = entity.getEntityWorld()
.getBlockState(entity.getBlockPos().down());
// Check for stairs so we can keep Pegasi from flailing their wings as they descend
double offsetAmount = below.getBlock() instanceof StairsBlock ? 1 : 0.05;
Vec3d pos = entity.getPos();
BlockPos blockpos = new BlockPos(
Math.floor(pos.x),
Math.floor(pos.y - offsetAmount),
Math.floor(pos.z));
BlockState state = entity.getEntityWorld()
.getBlockState(blockpos);
return !state.isAir();
}
@Override
public boolean isSwimming(LivingEntity entity) {
return entity.isSwimming() || entity.isInSwimmingPose();