PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-03-25 05:00:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Backport: Fixed floating pegasi

Browse source
This commit is contained in:
Sollace 2019-08-12 16:55:37 +02:00
parent 46bc422d45
commit c7444ccca3
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/pony/data/Pony.java
View file

@ -8,13 +8,18 @@ import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage;
import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture;
import com.voxelmodpack.hdskins.util.ProfileTextureUtil;
import net.minecraft.block.BlockStairs;
import net.minecraft.block.BlockState;
import net.minecraft.block.StairsBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.client.resources.IResource;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item;
@ -130,13 +135,37 @@ public class Pony extends Touchable<Pony> implements IPony {
@Override
public boolean isFlying(EntityLivingBase entity) {
return !(entity.onGround
return !(isOnGround(entity)
|| entity.isRiding()
|| (entity.isOnLadder() && !(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isFlying))
|| entity.isInWater()
|| entity.isPlayerSleeping());
}
/**
* 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(EntityLivingBase entity) {
if (entity.onGround) {
return true;
}
IBlockState below = entity.getEntityWorld()
.getBlockState(entity.getPosition().down());
// Check for stairs so we can keep Pegasi from flailing their wings as they descend
double offsetAmount = below.getBlock() instanceof BlockStairs ? 1 : 0.05;
Vec3d pos = entity.getPositionVector();
BlockPos blockpos = new BlockPos(
Math.floor(pos.x),
Math.floor(pos.y - offsetAmount),
Math.floor(pos.z));
return !entity.getEntityWorld().isAirBlock(blockpos);
}
@Override
public boolean isSwimming(EntityLivingBase entity) {
return isFullySubmerged(entity) && !(entity.onGround || entity.isOnLadder());