2 files changed, 24 insertions, 18 deletions

diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 9b089458d..1cb6ff156 100644
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -225,26 +225,30 @@ int LuaLocalPlayer::l_get_physics_override(lua_State *L)
 {
 	LocalPlayer *player = getobject(L, 1);
 
-	lua_newtable(L);
-	lua_pushnumber(L, player->physics_override_speed);
-	lua_setfield(L, -2, "speed");
-
-	lua_pushnumber(L, player->physics_override_jump);
-	lua_setfield(L, -2, "jump");
-
-	lua_pushnumber(L, player->physics_override_gravity);
-	lua_setfield(L, -2, "gravity");
-
-	lua_pushboolean(L, player->physics_override_sneak);
-	lua_setfield(L, -2, "sneak");
-
-	lua_pushboolean(L, player->physics_override_sneak_glitch);
-	lua_setfield(L, -2, "sneak_glitch");
+	push_physics_override(L, player->physics_override_speed, player->physics_override_jump, player->physics_override_gravity, player->physics_override_sneak, player->physics_override_sneak_glitch, player->physics_override_new_move);
+	
+	return 1;
+}
 
-	lua_pushboolean(L, player->physics_override_new_move);
-	lua_setfield(L, -2, "new_move");
+// set_physics_override(self, override)
+int LuaLocalPlayer::l_set_physics_override(lua_State *L)
+{
+	LocalPlayer *player = getobject(L, 1);
+	
+	player->physics_override_speed = getfloatfield_default(
+			L, 2, "speed", player->physics_override_speed);
+	player->physics_override_jump = getfloatfield_default(
+			L, 2, "jump", player->physics_override_jump);
+	player->physics_override_gravity = getfloatfield_default(
+			L, 2, "gravity", player->physics_override_gravity);
+	player->physics_override_sneak = getboolfield_default(
+			L, 2, "sneak", player->physics_override_sneak);
+	player->physics_override_sneak_glitch = getboolfield_default(
+			L, 2, "sneak_glitch", player->physics_override_sneak_glitch);
+	player->physics_override_new_move = getboolfield_default(
+			L, 2, "new_move", player->physics_override_new_move);
 
-	return 1;
+	return 0;
 }
 
 int LuaLocalPlayer::l_get_last_pos(lua_State *L)
@@ -561,6 +565,7 @@ const luaL_Reg LuaLocalPlayer::methods[] = {
 		luamethod(LuaLocalPlayer, is_climbing),
 		luamethod(LuaLocalPlayer, swimming_vertical),
 		luamethod(LuaLocalPlayer, get_physics_override),
+		luamethod(LuaLocalPlayer, set_physics_override),
 		// TODO: figure our if these are useful in any way
 		luamethod(LuaLocalPlayer, get_last_pos),
 		luamethod(LuaLocalPlayer, get_last_velocity),
diff --git a/src/script/lua_api/l_localplayer.h b/src/script/lua_api/l_localplayer.h
index c436c3b11..33e23d178 100644
--- a/src/script/lua_api/l_localplayer.h
+++ b/src/script/lua_api/l_localplayer.h
@@ -74,6 +74,7 @@ private:
 	static int l_swimming_vertical(lua_State *L);
 
 	static int l_get_physics_override(lua_State *L);
+	static int l_set_physics_override(lua_State *L);
 
 	static int l_get_override_pos(lua_State *L);