aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/localplayer.cpp48
-rw-r--r--src/localplayer.h7
-rw-r--r--src/network/clientpackethandler.cpp1
-rw-r--r--src/script/lua_api/l_localplayer.cpp9
-rw-r--r--src/script/lua_api/l_localplayer.h1
5 files changed, 36 insertions, 30 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index ab44f155f..9e30aeac8 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -35,7 +35,6 @@ LocalPlayer::LocalPlayer(Client *client, const char *name):
Player(name, client->idef()),
parent(0),
hp(PLAYER_MAX_HP),
- got_teleported(false),
isAttached(false),
touching_ground(false),
in_liquid(false),
@@ -305,29 +304,43 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
if (control.sneak && m_sneak_node_exists &&
!(fly_allowed && g_settings->getBool("free_move")) &&
!in_liquid && !is_climbing &&
- physics_override_sneak && !got_teleported) {
- v3f sn_f = intToFloat(m_sneak_node, BS);
- const v3f bmin = m_sneak_node_bb_top.MinEdge;
- const v3f bmax = m_sneak_node_bb_top.MaxEdge;
+ physics_override_sneak) {
+ const v3f sn_f = intToFloat(m_sneak_node, BS);
+ const v3f bmin = sn_f + m_sneak_node_bb_top.MinEdge;
+ const v3f bmax = sn_f + m_sneak_node_bb_top.MaxEdge;
+ const v3f old_pos = position;
+ const v3f old_speed = m_speed;
position.X = rangelim(position.X,
- sn_f.X+bmin.X - sneak_max.X, sn_f.X+bmax.X + sneak_max.X);
+ bmin.X - sneak_max.X, bmax.X + sneak_max.X);
position.Z = rangelim(position.Z,
- sn_f.Z+bmin.Z - sneak_max.Z, sn_f.Z+bmax.Z + sneak_max.Z);
+ bmin.Z - sneak_max.Z, bmax.Z + sneak_max.Z);
+
+ if (position.X != old_pos.X)
+ m_speed.X = 0;
+ if (position.Z != old_pos.Z)
+ m_speed.Z = 0;
// Because we keep the player collision box on the node, limiting
// position.Y is not necessary but useful to prevent players from
// being inside a node if sneaking on e.g. the lower part of a stair
if (!m_sneak_ladder_detected) {
- position.Y = MYMAX(position.Y, sn_f.Y+bmax.Y);
+ position.Y = MYMAX(position.Y, bmax.Y);
} else {
// legacy behaviour that sometimes causes some weird slow sinking
m_speed.Y = MYMAX(m_speed.Y, 0);
}
- }
- if (got_teleported)
- got_teleported = false;
+ if (collision_info != NULL &&
+ m_speed.Y - old_speed.Y > BS) {
+ // Collide with sneak node, report fall damage
+ CollisionInfo sn_info;
+ sn_info.node_p = m_sneak_node;
+ sn_info.old_speed = old_speed;
+ sn_info.new_speed = m_speed;
+ collision_info->push_back(sn_info);
+ }
+ }
// TODO: this shouldn't be hardcoded but transmitted from server
float player_stepheight = touching_ground ? (BS*0.6) : (BS*0.2);
@@ -449,9 +462,11 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
m_ledge_detected = detectLedge(map, nodemgr, floatToInt(position, BS));
/*
- Set new position
+ Set new position but keep sneak node set
*/
+ bool sneak_node_exists = m_sneak_node_exists;
setPosition(position);
+ m_sneak_node_exists = sneak_node_exists;
/*
Report collisions
@@ -917,7 +932,7 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
*/
if (control.sneak && m_sneak_node_exists &&
!(fly_allowed && g_settings->getBool("free_move")) && !in_liquid &&
- physics_override_sneak && !got_teleported) {
+ physics_override_sneak) {
f32 maxd = 0.5 * BS + sneak_max;
v3f lwn_f = intToFloat(m_sneak_node, BS);
position.X = rangelim(position.X, lwn_f.X - maxd, lwn_f.X + maxd);
@@ -938,9 +953,6 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
}
}
- if (got_teleported)
- got_teleported = false;
-
// this shouldn't be hardcoded but transmitted from server
float player_stepheight = touching_ground ? (BS * 0.6) : (BS * 0.2);
@@ -1055,9 +1067,11 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
}
/*
- Set new position
+ Set new position but keep sneak node set
*/
+ bool sneak_node_exists = m_sneak_node_exists;
setPosition(position);
+ m_sneak_node_exists = sneak_node_exists;
/*
Report collisions
diff --git a/src/localplayer.h b/src/localplayer.h
index d8d2f310b..dcfefcb1a 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -47,7 +47,6 @@ public:
ClientActiveObject *parent;
u16 hp;
- bool got_teleported;
bool isAttached;
bool touching_ground;
// This oscillates so that the player jumps a bit above the surface
@@ -126,7 +125,11 @@ public:
f32 getPitch() const { return m_pitch; }
- void setPosition(const v3f &position) { m_position = position; }
+ inline void setPosition(const v3f &position)
+ {
+ m_position = position;
+ m_sneak_node_exists = false;
+ }
v3f getPosition() const { return m_position; }
v3f getEyePosition() const { return m_position + getEyeOffset(); }
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index a895acc84..4316a77d4 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -561,7 +561,6 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
*pkt >> pos >> pitch >> yaw;
- player->got_teleported = true;
player->setPosition(pos);
infostream << "Client got TOCLIENT_MOVE_PLAYER"
diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 4b44bb709..177df55f3 100644
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -68,14 +68,6 @@ int LuaLocalPlayer::l_get_name(lua_State *L)
return 1;
}
-int LuaLocalPlayer::l_is_teleported(lua_State *L)
-{
- LocalPlayer *player = getobject(L, 1);
-
- lua_pushboolean(L, player->got_teleported);
- return 1;
-}
-
int LuaLocalPlayer::l_is_attached(lua_State *L)
{
LocalPlayer *player = getobject(L, 1);
@@ -386,7 +378,6 @@ const luaL_Reg LuaLocalPlayer::methods[] = {
luamethod(LuaLocalPlayer, get_velocity),
luamethod(LuaLocalPlayer, get_hp),
luamethod(LuaLocalPlayer, get_name),
- luamethod(LuaLocalPlayer, is_teleported),
luamethod(LuaLocalPlayer, is_attached),
luamethod(LuaLocalPlayer, is_touching_ground),
luamethod(LuaLocalPlayer, is_in_liquid),
diff --git a/src/script/lua_api/l_localplayer.h b/src/script/lua_api/l_localplayer.h
index 1070857c5..6ec3f4c09 100644
--- a/src/script/lua_api/l_localplayer.h
+++ b/src/script/lua_api/l_localplayer.h
@@ -39,7 +39,6 @@ private:
static int l_get_name(lua_State *L);
- static int l_is_teleported(lua_State *L);
static int l_is_attached(lua_State *L);
static int l_is_touching_ground(lua_State *L);
static int l_is_in_liquid(lua_State *L);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 13:12:22 +0000