1
0
mirror of https://github.com/p2r3/bareiron.git synced 2025-10-01 23:25:09 +02:00

make flowing water break falls

This commit is contained in:
p2r3
2025-08-29 23:38:45 +03:00
parent ec7bb49876
commit ba68f435b7

View File

@@ -187,8 +187,11 @@ void handlePacket (int client_fd, int length, int packet_id, int state) {
// Handle fall damage
if (on_ground) {
int16_t damage = player->grounded_y - player->y - 3;
if (damage > 0 && getBlockAt(player->x, player->y, player->z) != B_water) {
hurtEntity(client_fd, -1, D_fall, damage);
if (damage > 0) {
uint8_t block_feet = getBlockAt(player->x, player->y, player->z);
if (block_feet < B_water || block_feet > B_water + 7) {
hurtEntity(client_fd, -1, D_fall, damage);
}
}
player->grounded_y = player->y;
}