7 files changed, 72 insertions, 18 deletions

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index cf671d5ca..aed576372 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -47,6 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <algorithm>
 #include <cmath>
 #include "client/shader.h"
+#include "script/scripting_client.h"
 
 class Settings;
 struct ToolCapabilities;
@@ -1673,6 +1674,11 @@ void GenericCAO::processMessage(const std::string &data)
 
 		if(m_is_local_player)
 		{
+			Client *client = m_env->getGameDef();
+			
+			if (client->modsLoaded() && client->getScript()->on_recieve_physics_override(override_speed, override_jump, override_gravity, sneak, sneak_glitch, new_move))
+				return;
+			
 			LocalPlayer *player = m_env->getLocalPlayer();
 			player->physics_override_speed = override_speed;
 			player->physics_override_jump = override_jump;
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 210363417..78c46f0e0 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -2096,3 +2096,26 @@ void push_collision_move_result(lua_State *L, const collisionMoveResult &res)
 	lua_setfield(L, -2, "collisions");
 	/**/
 }
+
+void push_physics_override(lua_State *L, float speed, float jump, float gravity, bool sneak, bool sneak_glitch, bool new_move)
+{
+	lua_createtable(L, 0, 6);
+	
+	lua_pushnumber(L, speed);
+	lua_setfield(L, -2, "speed");
+
+	lua_pushnumber(L, jump);
+	lua_setfield(L, -2, "jump");
+
+	lua_pushnumber(L, gravity);
+	lua_setfield(L, -2, "gravity");
+
+	lua_pushboolean(L, sneak);
+	lua_setfield(L, -2, "sneak");
+
+	lua_pushboolean(L, sneak_glitch);
+	lua_setfield(L, -2, "sneak_glitch");
+
+	lua_pushboolean(L, new_move);
+	lua_setfield(L, -2, "new_move");
+}
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 5a8bf6700..eeef71c36 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -202,3 +202,5 @@ void               push_hud_element          (lua_State *L, HudElement *elem);
 HudElementStat     read_hud_change           (lua_State *L, HudElement *elem, void **value);
 
 void               push_collision_move_result(lua_State *L, const collisionMoveResult &res);
+
+void			   push_physics_override	 (lua_State *L, float speed, float jump, float gravity, bool sneak, bool sneak_glitch, bool new_move);
diff --git a/src/script/cpp_api/s_client.cpp b/src/script/cpp_api/s_client.cpp
index dd9019d4d..981b08537 100644
--- a/src/script/cpp_api/s_client.cpp
+++ b/src/script/cpp_api/s_client.cpp
@@ -221,6 +221,22 @@ bool ScriptApiClient::on_item_use(const ItemStack &item, const PointedThing &poi
 	return readParam<bool>(L, -1);
 }
 
+bool ScriptApiClient::on_recieve_physics_override(float speed, float jump, float gravity, bool sneak, bool sneak_glitch, bool new_move)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	// Get core.registered_on_recieve_physics_override
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_recieve_physics_override");
+
+	// Push data
+	push_physics_override(L, speed, jump, gravity, sneak, sneak_glitch, new_move);
+
+	// Call functions
+	runCallbacks(1, RUN_CALLBACKS_MODE_OR);
+	return readParam<bool>(L, -1);
+}
+
 bool ScriptApiClient::on_inventory_open(Inventory *inventory)
 {
 	SCRIPTAPI_PRECHECKHEADER
diff --git a/src/script/cpp_api/s_client.h b/src/script/cpp_api/s_client.h
index 177dce3ea..2ad3bcfad 100644
--- a/src/script/cpp_api/s_client.h
+++ b/src/script/cpp_api/s_client.h
@@ -57,6 +57,7 @@ public:
 	bool on_punchnode(v3s16 p, MapNode node);
 	bool on_placenode(const PointedThing &pointed, const ItemDefinition &item);
 	bool on_item_use(const ItemStack &item, const PointedThing &pointed);
+	bool on_recieve_physics_override(float override_speed, float override_jump, float override_gravity, bool sneak, bool sneak_glitch, bool new_move);
 
 	bool on_inventory_open(Inventory *inventory);
 	void open_enderchest();
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);