Merge branch 'master' into 1.21.3

# Conflicts:
#	gradle.properties
This commit is contained in:
Oth3r 2025-03-13 17:39:41 -05:00
commit 2e7967699e
3 changed files with 4 additions and 18 deletions

View file

@ -1,15 +1,2 @@
# v1.2.2 # v1.2.3
more configuration! * fixed not being able to sit when the Y level was below 0
### height-difference-limit
new server config for y difference limit for sitting
limit how far above or below a block can compared to a player be to sit!
**default**: 1 block above and below the player's y
### fixes / changelog:
* fixed interaction-blocks not getting copied correctly when updating the file
* fixed actionbar text for toggling sitting ablity not displaying correctly
* added `height-difference-limit` `server-config` option
* added German localization (de_de)
* added Simplified Chinese localization (zh_ch)

View file

@ -10,7 +10,7 @@ yarn_mappings=1.21.3+build.2
loader_version=0.16.10 loader_version=0.16.10
# Mod Properties # Mod Properties
mod_version=1.2.2+1.21.3 mod_version=1.2.3+1.21.3
maven_group=one.oth3r maven_group=one.oth3r
file_name=sit! file_name=sit!

View file

@ -227,8 +227,7 @@ public class Utl {
public static BlockPos getBlockPos(DisplayEntity.TextDisplayEntity entity) { public static BlockPos getBlockPos(DisplayEntity.TextDisplayEntity entity) {
// the entity Y level, adjusted // the entity Y level, adjusted
// the adjustment - is the opposite of the offset applied in Entity.create() // the adjustment - is the opposite of the offset applied in Entity.create()
double entityY = entity.getY() + (Y_ADJUSTMENT*-1); double entityY = entity.getBlockY() + (Y_ADJUSTMENT*-1);
// get the block pos // get the block pos
BlockPos pos = new BlockPos(entity.getBlockX(),(int)entityY,entity.getBlockZ()); BlockPos pos = new BlockPos(entity.getBlockX(),(int)entityY,entity.getBlockZ());
// if above the block, subtract 1 // if above the block, subtract 1