Skip to content

Fix #323: lay pose renders at world bottom on Folia #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RICE0707 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix #323: lay pose renders at world bottom on Folia #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0fe5db
Fix build failed
RICE0707 Jul 15, 2026
58a0228
Fix #323
RICE0707 Jul 15, 2026
029fb25
Merge branch 'main' into main
RICE0707 Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ allprojects {
tasks.withType<Javadoc>().configureEach {
options.encoding = "UTF-8"
}

configurations.all {
resolutionStrategy.force("net.kyori:adventure-text-serializer-ansi:4.26.1")
}
}

dependencies {
Expand Down
13 changes: 12 additions & 1 deletion mcv/v1_19_4/src/main/java/dev/geco/gsit/mcv/v1_19_4/model/Pose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public class Pose implements dev.geco.gsit.model.Pose {
private final Location blockLocation;
private final Block bedBlock;
private final BlockPos bedPos;
private final double height;
private final Direction direction;
protected ClientboundBlockUpdatePacket setBedPacket;
protected ClientboundPlayerInfoUpdatePacket addNpcInfoPacket;
Expand Down Expand Up @@ -126,6 +127,7 @@ public Pose(Seat seat, PoseType poseType) {
bedPos = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());

playerNpc = createNPC();
height = seatLocation.getY();
playerNpc.moveTo(seatLocation.getX(), seatLocation.getY() + (poseType == PoseType.LAY || poseType == PoseType.LAY_BACK ? 0.3125d : poseType == PoseType.SPIN ? 0.2d : 0d), seatLocation.getZ(), 0f, 0f);

direction = getDirection();
Expand Down Expand Up @@ -214,7 +216,16 @@ public void spawn() {
startUpdate();
}

private void addViewerPlayer(Player player) { sendPacket(player, bundle); }
private void addViewerPlayer(Player player) {
sendPacket(player, bundle);
if((poseType != PoseType.LAY && poseType != PoseType.LAY_BACK) || height < 1) return;
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
}, player, 1);
}, player, 1);
}

@Override
public void remove() {
Expand Down
13 changes: 12 additions & 1 deletion mcv/v1_20/src/main/java/dev/geco/gsit/mcv/v1_20/model/Pose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public class Pose implements dev.geco.gsit.model.Pose {
private final Location blockLocation;
private final Block bedBlock;
private final BlockPos bedPos;
private final double height;
private final Direction direction;
protected ClientboundBlockUpdatePacket setBedPacket;
protected ClientboundPlayerInfoUpdatePacket addNpcInfoPacket;
Expand Down Expand Up @@ -126,6 +127,7 @@ public Pose(Seat seat, PoseType poseType) {
bedPos = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());

playerNpc = createNPC();
height = seatLocation.getY();
playerNpc.moveTo(seatLocation.getX(), seatLocation.getY() + (poseType == PoseType.LAY || poseType == PoseType.LAY_BACK ? 0.3125d : poseType == PoseType.SPIN ? 0.2d : 0d), seatLocation.getZ(), 0f, 0f);

direction = getDirection();
Expand Down Expand Up @@ -214,7 +216,16 @@ public void spawn() {
startUpdate();
}

private void addViewerPlayer(Player player) { sendPacket(player, bundle); }
private void addViewerPlayer(Player player) {
sendPacket(player, bundle);
if((poseType != PoseType.LAY && poseType != PoseType.LAY_BACK) || height < 1) return;
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
}, player, 1);
}, player, 1);
}

@Override
public void remove() {
Expand Down
13 changes: 12 additions & 1 deletion mcv/v1_20_2/src/main/java/dev/geco/gsit/mcv/v1_20_2/model/Pose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public class Pose implements dev.geco.gsit.model.Pose {
private final Location blockLocation;
private final Block bedBlock;
private final BlockPos bedPos;
private final double height;
private final Direction direction;
protected ClientboundBlockUpdatePacket setBedPacket;
protected ClientboundPlayerInfoUpdatePacket addNpcInfoPacket;
Expand Down Expand Up @@ -127,6 +128,7 @@ public Pose(Seat seat, PoseType poseType) {
bedPos = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());

playerNpc = createNPC();
height = seatLocation.getY() + gSitMain.getSitService().getBaseOffset();
playerNpc.moveTo(seatLocation.getX(), seatLocation.getY() + gSitMain.getSitService().getBaseOffset() + (poseType == PoseType.LAY || poseType == PoseType.LAY_BACK ? 0.1125d : 0d), seatLocation.getZ(), 0f, 0f);

direction = getDirection();
Expand Down Expand Up @@ -215,7 +217,16 @@ public void spawn() {
startUpdate();
}

private void addViewerPlayer(Player player) { sendPacket(player, bundle); }
private void addViewerPlayer(Player player) {
sendPacket(player, bundle);
if((poseType != PoseType.LAY && poseType != PoseType.LAY_BACK) || height < 1) return;
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
}, player, 1);
}, player, 1);
}

@Override
public void remove() {
Expand Down
13 changes: 12 additions & 1 deletion mcv/v1_20_3/src/main/java/dev/geco/gsit/mcv/v1_20_3/model/Pose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public class Pose implements dev.geco.gsit.model.Pose {
private final Location blockLocation;
private final Block bedBlock;
private final BlockPos bedPos;
private final double height;
private final Direction direction;
protected ClientboundBlockUpdatePacket setBedPacket;
protected ClientboundPlayerInfoUpdatePacket addNpcInfoPacket;
Expand Down Expand Up @@ -128,6 +129,7 @@ public Pose(Seat seat, PoseType poseType) {
bedPos = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());

playerNpc = createNPC();
height = seatLocation.getY() + gSitMain.getSitService().getBaseOffset();
playerNpc.moveTo(seatLocation.getX(), seatLocation.getY() + gSitMain.getSitService().getBaseOffset() + (poseType == PoseType.LAY || poseType == PoseType.LAY_BACK ? 0.1125d : 0d), seatLocation.getZ(), 0f, 0f);

direction = getDirection();
Expand Down Expand Up @@ -248,7 +250,16 @@ public void spawn() {
});
}

private void addViewerPlayer(Player player) { sendPacket(player, bundle); }
private void addViewerPlayer(Player player) {
sendPacket(player, bundle);
if((poseType != PoseType.LAY && poseType != PoseType.LAY_BACK) || height < 1) return;
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
}, player, 1);
}, player, 1);
}

@Override
public void remove() {
Expand Down
15 changes: 13 additions & 2 deletions mcv/v1_20_5/src/main/java/dev/geco/gsit/mcv/v1_20_5/model/Pose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public class Pose implements dev.geco.gsit.model.Pose {
private final Location blockLocation;
private final Block bedBlock;
private final BlockPos bedPos;
private final double height;
private final Direction direction;
protected ClientboundBlockUpdatePacket setBedPacket;
protected ClientboundPlayerInfoUpdatePacket addNpcInfoPacket;
Expand Down Expand Up @@ -130,8 +131,9 @@ public Pose(Seat seat, PoseType poseType) {
bedPos = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());

playerNpc = createNPC();
double offset = seatLocation.getY() + gSitMain.getSitService().getBaseOffset();
height = seatLocation.getY() + gSitMain.getSitService().getBaseOffset();
double scale = serverPlayer.getScale();
double offset = height;
if(poseType == PoseType.LAY || poseType == PoseType.LAY_BACK) offset += 0.1125d * scale;
playerNpc.moveTo(seatLocation.getX(), offset, seatLocation.getZ(), 0f, 0f);

Expand Down Expand Up @@ -255,7 +257,16 @@ public void spawn() {
});
}

private void addViewerPlayer(Player player) { sendPacket(player, bundle); }
private void addViewerPlayer(Player player) {
sendPacket(player, bundle);
if((poseType != PoseType.LAY && poseType != PoseType.LAY_BACK) || height < 1) return;
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
}, player, 1);
}, player, 1);
}

@Override
public void remove() {
Expand Down
15 changes: 13 additions & 2 deletions mcv/v1_21/src/main/java/dev/geco/gsit/mcv/v1_21/model/Pose.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public class Pose implements dev.geco.gsit.model.Pose {
private final Location blockLocation;
private final Block bedBlock;
private final BlockPos bedPos;
private final double height;
private final Direction direction;
protected ClientboundBlockUpdatePacket setBedPacket;
protected ClientboundPlayerInfoUpdatePacket addNpcInfoPacket;
Expand Down Expand Up @@ -130,8 +131,9 @@ public Pose(Seat seat, PoseType poseType) {
bedPos = new BlockPos(blockLocation.getBlockX(), blockLocation.getBlockY(), blockLocation.getBlockZ());

playerNpc = createNPC();
double offset = seatLocation.getY() + gSitMain.getSitService().getBaseOffset();
height = seatLocation.getY() + gSitMain.getSitService().getBaseOffset();
double scale = serverPlayer.getScale();
double offset = height;
if(poseType == PoseType.LAY || poseType == PoseType.LAY_BACK) offset += 0.1125d * scale;
if(poseType == PoseType.BELLYFLOP) offset += -0.19 * scale;
playerNpc.moveTo(seatLocation.getX(), offset, seatLocation.getZ(), 0f, 0f);
Expand Down Expand Up @@ -256,7 +258,16 @@ public void spawn() {
});
}

private void addViewerPlayer(Player player) { sendPacket(player, bundle); }
private void addViewerPlayer(Player player) {
sendPacket(player, bundle);
if((poseType != PoseType.LAY && poseType != PoseType.LAY_BACK) || height < 1) return;
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
gSitMain.getTaskService().runDelayed(() -> {
sendPacket(player, teleportNpcPacket);
}, player, 1);
}, player, 1);
}

@Override
public void remove() {
Expand Down