virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix entity y adjustment system

Browse source
This commit is contained in:
Oth3r 2024-12-22 18:12:15 -06:00
commit abecde44c8
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/one/oth3r/sit/utl/Utl.java
View file

@ -205,6 +205,10 @@ public class Utl {
} }
public static class Entity { public static class Entity {
/**
* the customizable y height of the entity, as some versions have different sitting heights on the entity
*/
private static final double Y_ADJUSTMENT = 0;
/** /**
* checks if the entity's block is still there, & is valid * checks if the entity's block is still there, & is valid
@ -221,8 +225,12 @@ public class Utl {
* gets the bound block pos of the sit entity * gets the bound block pos of the sit entity
*/ */
public static BlockPos getBlockPos(DisplayEntity.TextDisplayEntity entity) { public static BlockPos getBlockPos(DisplayEntity.TextDisplayEntity entity) {
// the entity Y level, adjusted
// the adjustment - is the opposite of the offset applied in Entity.create()
double entityY = entity.getY() + (Y_ADJUSTMENT*-1);
// get the block pos // get the block pos
BlockPos pos = new BlockPos(entity.getBlockX(),entity.getBlockY(),entity.getBlockZ()); BlockPos pos = new BlockPos(entity.getBlockX(),(int)entityY,entity.getBlockZ());
// if above the block, subtract 1 // if above the block, subtract 1
if (isAboveBlockHeight(entity)) { if (isAboveBlockHeight(entity)) {
pos = pos.add(0,-1,0); pos = pos.add(0,-1,0);
@ -254,20 +262,20 @@ public class Utl {
entity.setInvulnerable(true); entity.setInvulnerable(true);
entity.setInvisible(true); entity.setInvisible(true);
/// make a double for adjusting the entity height if some versions change the player sit height on entities again
double adjustmentY = 0;
// get the entities y level // get the entities y level
double entityY = blockPos.getY(); double entityY = blockPos.getY();
entityY += sitHeight + adjustmentY; entityY += sitHeight;
// set the entities position // set the entities position
entity.updatePositionAndAngles(blockPos.getX()+.5, entityY, blockPos.getZ()+.5, 0, 0); entity.updatePosition(blockPos.getX()+.5, entityY, blockPos.getZ()+.5);
// change pitch based on if player is sitting below block height or not (full block height only) // change pitch based on if player is sitting below block height or not (full block height only)
if (entity.getY() == blockPos.getY() + 1) entity.setPitch(90); // below if (entity.getY() == blockPos.getY() + 1) entity.setPitch(90); // below
else entity.setPitch(-90); // above else entity.setPitch(-90); // above
// adjusting the entity height after doing the main calculations, for correct player visuals
entity.updatePosition(entity.getX(),entityY+Y_ADJUSTMENT,entity.getZ());
return entity; return entity;
} }