Merged Minetest

1 files changed, 672 insertions, 635 deletions

diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index e7394133a..bc59bd55c 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -44,43 +44,44 @@ ObjectRef* ObjectRef::checkobject(lua_State *L, int narg)
 {
 	luaL_checktype(L, narg, LUA_TUSERDATA);
 	void *ud = luaL_checkudata(L, narg, className);
-	if (!ud) luaL_typerror(L, narg, className);
+	if (ud == nullptr)
+		luaL_typerror(L, narg, className);
 	return *(ObjectRef**)ud;  // unbox pointer
 }
 
 ServerActiveObject* ObjectRef::getobject(ObjectRef *ref)
 {
-	ServerActiveObject *co = ref->m_object;
-	if (co && co->isGone())
-		return NULL;
-	return co;
+	ServerActiveObject *sao = ref->m_object;
+	if (sao && sao->isGone())
+		return nullptr;
+	return sao;
 }
 
 LuaEntitySAO* ObjectRef::getluaobject(ObjectRef *ref)
 {
-	ServerActiveObject *obj = getobject(ref);
-	if (obj == NULL)
-		return NULL;
-	if (obj->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
-		return NULL;
-	return (LuaEntitySAO*)obj;
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return nullptr;
+	if (sao->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
+		return nullptr;
+	return (LuaEntitySAO*)sao;
 }
 
 PlayerSAO* ObjectRef::getplayersao(ObjectRef *ref)
 {
-	ServerActiveObject *obj = getobject(ref);
-	if (obj == NULL)
-		return NULL;
-	if (obj->getType() != ACTIVEOBJECT_TYPE_PLAYER)
-		return NULL;
-	return (PlayerSAO*)obj;
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return nullptr;
+	if (sao->getType() != ACTIVEOBJECT_TYPE_PLAYER)
+		return nullptr;
+	return (PlayerSAO*)sao;
 }
 
 RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 {
 	PlayerSAO *playersao = getplayersao(ref);
-	if (playersao == NULL)
-		return NULL;
+	if (playersao == nullptr)
+		return nullptr;
 	return playersao->getPlayer();
 }
 
@@ -88,9 +89,8 @@ RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 
 // garbage collector
 int ObjectRef::gc_object(lua_State *L) {
-	ObjectRef *o = *(ObjectRef **)(lua_touserdata(L, 1));
-	//infostream<<"ObjectRef::gc_object: o="<<o<<std::endl;
-	delete o;
+	ObjectRef *obj = *(ObjectRef **)(lua_touserdata(L, 1));
+	delete obj;
 	return 0;
 }
 
@@ -100,29 +100,30 @@ int ObjectRef::l_remove(lua_State *L)
 	GET_ENV_PTR;
 
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+	if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER)
 		return 0;
 
-	co->clearChildAttachments();
-	co->clearParentAttachment();
+	sao->clearChildAttachments();
+	sao->clearParentAttachment();
 
-	verbosestream << "ObjectRef::l_remove(): id=" << co->getId() << std::endl;
-	co->m_pending_removal = true;
+	verbosestream << "ObjectRef::l_remove(): id=" << sao->getId() << std::endl;
+	sao->m_pending_removal = true;
 	return 0;
 }
 
 // get_pos(self)
-// returns: {x=num, y=num, z=num}
 int ObjectRef::l_get_pos(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	push_v3f(L, co->getBasePosition() / BS);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	push_v3f(L, sao->getBasePosition() / BS);
 	return 1;
 }
 
@@ -131,28 +132,29 @@ int ObjectRef::l_set_pos(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	// pos
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
 	v3f pos = checkFloatPos(L, 2);
-	// Do it
-	co->setPos(pos);
+
+	sao->setPos(pos);
 	return 0;
 }
 
-// move_to(self, pos, continuous=false)
+// move_to(self, pos, continuous)
 int ObjectRef::l_move_to(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	// pos
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
 	v3f pos = checkFloatPos(L, 2);
-	// continuous
 	bool continuous = readParam<bool>(L, 3);
-	// Do it
-	co->moveTo(pos, continuous);
+
+	sao->moveTo(pos, continuous);
 	return 0;
 }
 
@@ -162,32 +164,26 @@ int ObjectRef::l_punch(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	ObjectRef *puncher_ref = checkobject(L, 2);
-	ServerActiveObject *co = getobject(ref);
+	ServerActiveObject *sao = getobject(ref);
 	ServerActiveObject *puncher = getobject(puncher_ref);
-	if (!co || !puncher)
+	if (sao == nullptr || puncher == nullptr)
 		return 0;
-	v3f dir;
-	if (lua_type(L, 5) != LUA_TTABLE)
-		dir = co->getBasePosition() - puncher->getBasePosition();
-	else
-		dir = read_v3f(L, 5);
-	float time_from_last_punch = 1000000;
-	if (lua_isnumber(L, 3))
-		time_from_last_punch = lua_tonumber(L, 3);
+
+	float time_from_last_punch = readParam<float>(L, 3, 1000000.0f);
 	ToolCapabilities toolcap = read_tool_capabilities(L, 4);
-	dir.normalize();
+	v3f dir = readParam<v3f>(L, 5, sao->getBasePosition() - puncher->getBasePosition());
 
-	u16 src_original_hp = co->getHP();
+	dir.normalize();
+	u16 src_original_hp = sao->getHP();
 	u16 dst_origin_hp = puncher->getHP();
 
-	// Do it
-	u16 wear = co->punch(dir, &toolcap, puncher, time_from_last_punch);
+	u16 wear = sao->punch(dir, &toolcap, puncher, time_from_last_punch);
 	lua_pushnumber(L, wear);
 
 	// If the punched is a player, and its HP changed
-	if (src_original_hp != co->getHP() &&
-			co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co,
+	if (src_original_hp != sao->getHP() &&
+			sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)sao,
 				PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, puncher));
 	}
 
@@ -195,45 +191,38 @@ int ObjectRef::l_punch(lua_State *L)
 	if (dst_origin_hp != puncher->getHP() &&
 			puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
 		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)puncher,
-				PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, co));
+				PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, sao));
 	}
 	return 1;
 }
 
-// right_click(self, clicker); clicker = an another ObjectRef
+// right_click(self, clicker)
 int ObjectRef::l_right_click(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	ObjectRef *ref2 = checkobject(L, 2);
-	ServerActiveObject *co = getobject(ref);
-	ServerActiveObject *co2 = getobject(ref2);
-	if (co == NULL) return 0;
-	if (co2 == NULL) return 0;
-	// Do it
-	co->rightClick(co2);
+	ServerActiveObject *sao = getobject(ref);
+	ServerActiveObject *sao2 = getobject(ref2);
+	if (sao == nullptr || sao2 == nullptr)
+		return 0;
+
+	sao->rightClick(sao2);
 	return 0;
 }
 
-// set_hp(self, hp)
-// hp = number of hitpoints (2 * number of hearts)
-// returns: nil
+// set_hp(self, hp, reason)
 int ObjectRef::l_set_hp(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-
-	// Get Object
 	ObjectRef *ref = checkobject(L, 1);
-	luaL_checknumber(L, 2);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
 
-	// Get HP
-	int hp = lua_tonumber(L, 2);
-
-	// Get Reason
+	int hp = readParam<float>(L, 2);
 	PlayerHPChangeReason reason(PlayerHPChangeReason::SET_HP);
+
 	reason.from_mod = true;
 	if (lua_istable(L, 3)) {
 		lua_pushvalue(L, 3);
@@ -248,35 +237,28 @@ int ObjectRef::l_set_hp(lua_State *L)
 		reason.lua_reference = luaL_ref(L, LUA_REGISTRYINDEX);
 	}
 
-	// Do it
-	co->setHP(hp, reason);
-	if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
-		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co, reason);
-
+	sao->setHP(hp, reason);
+	if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+		getServer(L)->SendPlayerHPOrDie((PlayerSAO *)sao, reason);
 	if (reason.hasLuaReference())
 		luaL_unref(L, LUA_REGISTRYINDEX, reason.lua_reference);
-
-	// Return
 	return 0;
 }
 
 // get_hp(self)
-// returns: number of hitpoints (2 * number of hearts)
-// 0 if not applicable to this type of object
 int ObjectRef::l_get_hp(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) {
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr) {
 		// Default hp is 1
 		lua_pushnumber(L, 1);
 		return 1;
 	}
-	int hp = co->getHP();
-	/*infostream<<"ObjectRef::l_get_hp(): id="<<co->getId()
-			<<" hp="<<hp<<std::endl;*/
-	// Return
+
+	int hp = sao->getHP();
+
 	lua_pushnumber(L, hp);
 	return 1;
 }
@@ -286,11 +268,12 @@ int ObjectRef::l_get_inventory(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	InventoryLocation loc = co->getInventoryLocation();
-	if (getServerInventoryMgr(L)->getInventory(loc) != NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	InventoryLocation loc = sao->getInventoryLocation();
+	if (getServerInventoryMgr(L)->getInventory(loc) != nullptr)
 		InvRef::create(L, loc);
 	else
 		lua_pushnil(L); // An object may have no inventory (nil)
@@ -302,11 +285,11 @@ int ObjectRef::l_get_wield_list(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (!co)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
 
-	lua_pushstring(L, co->getWieldList().c_str());
+	lua_pushstring(L, sao->getWieldList().c_str());
 	return 1;
 }
 
@@ -315,11 +298,11 @@ int ObjectRef::l_get_wield_index(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (!co)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
 
-	lua_pushinteger(L, co->getWieldIndex() + 1);
+	lua_pushinteger(L, sao->getWieldIndex() + 1);
 	return 1;
 }
 
@@ -328,31 +311,33 @@ int ObjectRef::l_get_wielded_item(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (!co) {
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr) {
 		// Empty ItemStack
 		LuaItemStack::create(L, ItemStack());
 		return 1;
 	}
 
 	ItemStack selected_item;
-	co->getWieldedItem(&selected_item, nullptr);
+	sao->getWieldedItem(&selected_item, nullptr);
 	LuaItemStack::create(L, selected_item);
 	return 1;
 }
 
-// set_wielded_item(self, itemstack or itemstring or table or nil)
+// set_wielded_item(self, item)
 int ObjectRef::l_set_wielded_item(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	// Do it
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
 	ItemStack item = read_item(L, 2, getServer(L)->idef());
-	bool success = co->setWieldedItem(item);
-	if (success && co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-		getServer(L)->SendInventory((PlayerSAO *)co, true);
+
+	bool success = sao->setWieldedItem(item);
+	if (success && sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+		getServer(L)->SendInventory((PlayerSAO *)sao, true);
 	}
 	lua_pushboolean(L, success);
 	return 1;
@@ -363,12 +348,14 @@ int ObjectRef::l_set_armor_groups(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	// Do it
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
 	ItemGroupList groups;
+
 	read_groups(L, 2, groups);
-	co->setArmorGroups(groups);
+	sao->setArmorGroups(groups);
 	return 0;
 }
 
@@ -377,77 +364,11 @@ int ObjectRef::l_get_armor_groups(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	// Do it
-	push_groups(L, co->getArmorGroups());
-	return 1;
-}
 
-// set_physics_override(self, physics_override_speed, physics_override_jump,
-//                      physics_override_gravity, sneak, sneak_glitch, new_move)
-int ObjectRef::l_set_physics_override(lua_State *L)
-{
-	NO_MAP_LOCK_REQUIRED;
-	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO *co = (PlayerSAO *) getobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	if (lua_istable(L, 2)) {
-		co->m_physics_override_speed = getfloatfield_default(
-				L, 2, "speed", co->m_physics_override_speed);
-		co->m_physics_override_jump = getfloatfield_default(
-				L, 2, "jump", co->m_physics_override_jump);
-		co->m_physics_override_gravity = getfloatfield_default(
-				L, 2, "gravity", co->m_physics_override_gravity);
-		co->m_physics_override_sneak = getboolfield_default(
-				L, 2, "sneak", co->m_physics_override_sneak);
-		co->m_physics_override_sneak_glitch = getboolfield_default(
-				L, 2, "sneak_glitch", co->m_physics_override_sneak_glitch);
-		co->m_physics_override_new_move = getboolfield_default(
-				L, 2, "new_move", co->m_physics_override_new_move);
-		co->m_physics_override_sent = false;
-	} else {
-		// old, non-table format
-		if (!lua_isnil(L, 2)) {
-			co->m_physics_override_speed = lua_tonumber(L, 2);
-			co->m_physics_override_sent = false;
-		}
-		if (!lua_isnil(L, 3)) {
-			co->m_physics_override_jump = lua_tonumber(L, 3);
-			co->m_physics_override_sent = false;
-		}
-		if (!lua_isnil(L, 4)) {
-			co->m_physics_override_gravity = lua_tonumber(L, 4);
-			co->m_physics_override_sent = false;
-		}
-	}
-	return 0;
-}
-
-// get_physics_override(self)
-int ObjectRef::l_get_physics_override(lua_State *L)
-{
-	NO_MAP_LOCK_REQUIRED;
-	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO *co = (PlayerSAO *)getobject(ref);
-	if (co == NULL)
-		return 0;
-	// Do it
-	lua_newtable(L);
-	lua_pushnumber(L, co->m_physics_override_speed);
-	lua_setfield(L, -2, "speed");
-	lua_pushnumber(L, co->m_physics_override_jump);
-	lua_setfield(L, -2, "jump");
-	lua_pushnumber(L, co->m_physics_override_gravity);
-	lua_setfield(L, -2, "gravity");
-	lua_pushboolean(L, co->m_physics_override_sneak);
-	lua_setfield(L, -2, "sneak");
-	lua_pushboolean(L, co->m_physics_override_sneak_glitch);
-	lua_setfield(L, -2, "sneak_glitch");
-	lua_pushboolean(L, co->m_physics_override_new_move);
-	lua_setfield(L, -2, "new_move");
+	push_groups(L, sao->getArmorGroups());
 	return 1;
 }
 
@@ -456,22 +377,16 @@ int ObjectRef::l_set_animation(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	v2f frames = v2f(1, 1);
-	if (!lua_isnil(L, 2))
-		frames = readParam<v2f>(L, 2);
-	float frame_speed = 15;
-	if (!lua_isnil(L, 3))
-		frame_speed = lua_tonumber(L, 3);
-	float frame_blend = 0;
-	if (!lua_isnil(L, 4))
-		frame_blend = lua_tonumber(L, 4);
-	bool frame_loop = true;
-	if (lua_isboolean(L, 5))
-		frame_loop = readParam<bool>(L, 5);
-	co->setAnimation(frames, frame_speed, frame_blend, frame_loop);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	v2f frame_range   = readParam<v2f>(L,  2, v2f(1, 1));
+	float frame_speed = readParam<float>(L, 3, 15.0f);
+	float frame_blend = readParam<float>(L, 4, 0.0f);
+	bool frame_loop   = readParam<bool>(L, 5, true);
+
+	sao->setAnimation(frame_range, frame_speed, frame_blend, frame_loop);
 	return 0;
 }
 
@@ -480,16 +395,16 @@ int ObjectRef::l_get_animation(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	// Do it
+
 	v2f frames = v2f(1,1);
 	float frame_speed = 15;
 	float frame_blend = 0;
 	bool frame_loop = true;
-	co->getAnimation(&frames, &frame_speed, &frame_blend, &frame_loop);
 
+	sao->getAnimation(&frames, &frame_speed, &frame_blend, &frame_loop);
 	push_v2f(L, frames);
 	lua_pushnumber(L, frame_speed);
 	lua_pushnumber(L, frame_blend);
@@ -497,23 +412,21 @@ int ObjectRef::l_get_animation(lua_State *L)
 	return 4;
 }
 
-// set_local_animation(self, {stand/idle}, {walk}, {dig}, {walk+dig}, frame_speed)
+// set_local_animation(self, idle, walk, dig, walk_while_dig, frame_speed)
 int ObjectRef::l_set_local_animation(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
-	// Do it
+
 	v2s32 frames[4];
 	for (int i=0;i<4;i++) {
 		if (!lua_isnil(L, 2+1))
 			frames[i] = read_v2s32(L, 2+i);
 	}
-	float frame_speed = 30;
-	if (!lua_isnil(L, 6))
-		frame_speed = lua_tonumber(L, 6);
+	float frame_speed = readParam<float>(L, 6, 30.0f);
 
 	getServer(L)->setLocalPlayerAnimations(player, frames, frame_speed);
 	lua_pushboolean(L, true);
@@ -526,7 +439,7 @@ int ObjectRef::l_get_local_animation(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	v2s32 frames[4];
@@ -541,27 +454,22 @@ int ObjectRef::l_get_local_animation(lua_State *L)
 	return 5;
 }
 
-// set_eye_offset(self, v3f first pv, v3f third pv)
+// set_eye_offset(self, firstperson, thirdperson)
 int ObjectRef::l_set_eye_offset(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
-	// Do it
-	v3f offset_first = v3f(0, 0, 0);
-	v3f offset_third = v3f(0, 0, 0);
 
-	if (!lua_isnil(L, 2))
-		offset_first = read_v3f(L, 2);
-	if (!lua_isnil(L, 3))
-		offset_third = read_v3f(L, 3);
+	v3f offset_first = read_v3f(L, 2);
+	v3f offset_third = read_v3f(L, 3);
 
 	// Prevent abuse of offset values (keep player always visible)
 	offset_third.X = rangelim(offset_third.X,-10,10);
 	offset_third.Z = rangelim(offset_third.Z,-5,5);
-	/* TODO: if possible: improve the camera colision detetion to allow Y <= -1.5) */
+	/* TODO: if possible: improve the camera collision detection to allow Y <= -1.5) */
 	offset_third.Y = rangelim(offset_third.Y,-10,15); //1.5*BS
 
 	getServer(L)->setPlayerEyeOffset(player, offset_first, offset_third);
@@ -575,9 +483,9 @@ int ObjectRef::l_get_eye_offset(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
-	// Do it
+
 	push_v3f(L, player->eye_offset_first);
 	push_v3f(L, player->eye_offset_third);
 	return 2;
@@ -588,14 +496,14 @@ int ObjectRef::l_send_mapblock(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
-	v3s16 p = read_v3s16(L, 2);
+
+	v3s16 pos = read_v3s16(L, 2);
 
 	session_t peer_id = player->getPeerId();
-	bool r = getServer(L)->SendBlock(peer_id, p);
+	bool r = getServer(L)->SendBlock(peer_id, pos);
 
 	lua_pushboolean(L, r);
 	return 1;
@@ -606,14 +514,13 @@ int ObjectRef::l_set_animation_frame_speed(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
 
-	// Do it
 	if (!lua_isnil(L, 2)) {
-		float frame_speed = lua_tonumber(L, 2);
-		co->setAnimationSpeed(frame_speed);
+		float frame_speed = readParam<float>(L, 2);
+		sao->setAnimationSpeed(frame_speed);
 		lua_pushboolean(L, true);
 	} else {
 		lua_pushboolean(L, false);
@@ -621,24 +528,20 @@ int ObjectRef::l_set_animation_frame_speed(lua_State *L)
 	return 1;
 }
 
-// set_bone_position(self, std::string bone, v3f position, v3f rotation)
+// set_bone_position(self, bone, position, rotation)
 int ObjectRef::l_set_bone_position(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	std::string bone;
-	if (!lua_isnil(L, 2))
-		bone = readParam<std::string>(L, 2);
-	v3f position = v3f(0, 0, 0);
-	if (!lua_isnil(L, 3))
-		position = check_v3f(L, 3);
-	v3f rotation = v3f(0, 0, 0);
-	if (!lua_isnil(L, 4))
-		rotation = check_v3f(L, 4);
-	co->setBonePosition(bone, position, rotation);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	std::string bone = readParam<std::string>(L, 2);
+	v3f position = check_v3f(L, 3);
+	v3f rotation = check_v3f(L, 4);
+
+	sao->setBonePosition(bone, position, rotation);
 	return 0;
 }
 
@@ -647,63 +550,53 @@ int ObjectRef::l_get_bone_position(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	// Do it
-	std::string bone;
-	if (!lua_isnil(L, 2))
-		bone = readParam<std::string>(L, 2);
+
+	std::string bone = readParam<std::string>(L, 2);
 
 	v3f position = v3f(0, 0, 0);
 	v3f rotation = v3f(0, 0, 0);
-	co->getBonePosition(bone, &position, &rotation);
+	sao->getBonePosition(bone, &position, &rotation);
 
 	push_v3f(L, position);
 	push_v3f(L, rotation);
 	return 2;
 }
 
-// set_attach(self, parent, bone, position, rotation)
+// set_attach(self, parent, bone, position, rotation, force_visible)
 int ObjectRef::l_set_attach(lua_State *L)
 {
 	GET_ENV_PTR;
-
 	ObjectRef *ref = checkobject(L, 1);
 	ObjectRef *parent_ref = checkobject(L, 2);
-	ServerActiveObject *co = getobject(ref);
+	ServerActiveObject *sao = getobject(ref);
 	ServerActiveObject *parent = getobject(parent_ref);
-	if (co == NULL)
-		return 0;
-
-	if (parent == NULL)
+	if (sao == nullptr || parent == nullptr)
 		return 0;
-
-	if (co == parent)
+	if (sao == parent)
 		throw LuaError("ObjectRef::set_attach: attaching object to itself is not allowed.");
 
-	// Do it
 	int parent_id = 0;
 	std::string bone;
 	v3f position = v3f(0, 0, 0);
 	v3f rotation = v3f(0, 0, 0);
-	co->getAttachment(&parent_id, &bone, &position, &rotation);
+	bool force_visible;
+
+	sao->getAttachment(&parent_id, &bone, &position, &rotation, &force_visible);
 	if (parent_id) {
 		ServerActiveObject *old_parent = env->getActiveObject(parent_id);
-		old_parent->removeAttachmentChild(co->getId());
+		old_parent->removeAttachmentChild(sao->getId());
 	}
 
-	bone = "";
-	if (!lua_isnil(L, 3))
-		bone = readParam<std::string>(L, 3);
-	position = v3f(0, 0, 0);
-	if (!lua_isnil(L, 4))
-		position = read_v3f(L, 4);
-	rotation = v3f(0, 0, 0);
-	if (!lua_isnil(L, 5))
-		rotation = read_v3f(L, 5);
-	co->setAttachment(parent->getId(), bone, position, rotation);
-	parent->addAttachmentChild(co->getId());
+	bone      = readParam<std::string>(L, 3, "");
+	position  = read_v3f(L, 4);
+	rotation  = read_v3f(L, 5);
+	force_visible = readParam<bool>(L, 6, false);
+
+	sao->setAttachment(parent->getId(), bone, position, rotation, force_visible);
+	parent->addAttachmentChild(sao->getId());
 	return 0;
 }
 
@@ -711,40 +604,61 @@ int ObjectRef::l_set_attach(lua_State *L)
 int ObjectRef::l_get_attach(lua_State *L)
 {
 	GET_ENV_PTR;
-
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
 
-	// Do it
 	int parent_id = 0;
 	std::string bone;
 	v3f position = v3f(0, 0, 0);
 	v3f rotation = v3f(0, 0, 0);
-	co->getAttachment(&parent_id, &bone, &position, &rotation);
-	if (!parent_id)
+	bool force_visible;
+
+	sao->getAttachment(&parent_id, &bone, &position, &rotation, &force_visible);
+	if (parent_id == 0)
 		return 0;
-	ServerActiveObject *parent = env->getActiveObject(parent_id);
 
+	ServerActiveObject *parent = env->getActiveObject(parent_id);
 	getScriptApiBase(L)->objectrefGetOrCreate(L, parent);
 	lua_pushlstring(L, bone.c_str(), bone.size());
 	push_v3f(L, position);
 	push_v3f(L, rotation);
-	return 4;
+	lua_pushboolean(L, force_visible);
+	return 5;
+}
+
+// get_children(self)
+int ObjectRef::l_get_children(lua_State *L)
+{
+	GET_ENV_PTR;
+	ObjectRef *ref = checkobject(L, 1);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	const std::unordered_set<int> child_ids = sao->getAttachmentChildIds();
+	int i = 0;
+
+	lua_createtable(L, child_ids.size(), 0);
+	for (const int id : child_ids) {
+		ServerActiveObject *child = env->getActiveObject(id);
+		getScriptApiBase(L)->objectrefGetOrCreate(L, child);
+		lua_rawseti(L, -2, ++i);
+	}
+	return 1;
 }
 
 // set_detach(self)
 int ObjectRef::l_set_detach(lua_State *L)
 {
 	GET_ENV_PTR;
-
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
 
-	co->clearParentAttachment();
+	sao->clearParentAttachment();
 	return 0;
 }
 
@@ -753,16 +667,16 @@ int ObjectRef::l_set_properties(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (!co)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
 
-	ObjectProperties *prop = co->accessObjectProperties();
-	if (!prop)
+	ObjectProperties *prop = sao->accessObjectProperties();
+	if (prop == nullptr)
 		return 0;
 
-	read_object_properties(L, 2, co, prop, getServer(L)->idef());
-	co->notifyObjectPropertiesModified();
+	read_object_properties(L, 2, sao, prop, getServer(L)->idef());
+	sao->notifyObjectPropertiesModified();
 	return 0;
 }
 
@@ -771,12 +685,14 @@ int ObjectRef::l_get_properties(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	ObjectProperties *prop = co->accessObjectProperties();
-	if (!prop)
+
+	ObjectProperties *prop = sao->accessObjectProperties();
+	if (prop == nullptr)
 		return 0;
+
 	push_object_properties(L, prop);
 	return 1;
 }
@@ -787,7 +703,7 @@ int ObjectRef::l_is_player(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	lua_pushboolean(L, (player != NULL));
+	lua_pushboolean(L, (player != nullptr));
 	return 1;
 }
 
@@ -796,12 +712,12 @@ int ObjectRef::l_set_nametag_attributes(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	ObjectProperties *prop = co->accessObjectProperties();
-	if (!prop)
+
+	ObjectProperties *prop = sao->accessObjectProperties();
+	if (prop == nullptr)
 		return 0;
 
 	lua_getfield(L, 2, "color");
@@ -815,7 +731,7 @@ int ObjectRef::l_set_nametag_attributes(lua_State *L)
 	std::string nametag = getstringfield_default(L, 2, "text", "");
 	prop->nametag = nametag;
 
-	co->notifyObjectPropertiesModified();
+	sao->notifyObjectPropertiesModified();
 	lua_pushboolean(L, true);
 	return 1;
 }
@@ -825,11 +741,11 @@ int ObjectRef::l_get_nametag_attributes(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	ServerActiveObject *co = getobject(ref);
-
-	if (co == NULL)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	ObjectProperties *prop = co->accessObjectProperties();
+
+	ObjectProperties *prop = sao->accessObjectProperties();
 	if (!prop)
 		return 0;
 
@@ -845,30 +761,41 @@ int ObjectRef::l_get_nametag_attributes(lua_State *L)
 
 /* LuaEntitySAO-only */
 
-// set_velocity(self, {x=num, y=num, z=num})
+// set_velocity(self, velocity)
 int ObjectRef::l_set_velocity(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	v3f pos = checkFloatPos(L, 2);
-	// Do it
-	co->setVelocity(pos);
+	LuaEntitySAO *sao = getluaobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	v3f vel = checkFloatPos(L, 2);
+
+	sao->setVelocity(vel);
 	return 0;
 }
 
-// add_velocity(self, {x=num, y=num, z=num})
+// add_velocity(self, velocity)
 int ObjectRef::l_add_velocity(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (!co)
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
 		return 0;
-	v3f pos = checkFloatPos(L, 2);
-	// Do it
-	co->addVelocity(pos);
+
+	v3f vel = checkFloatPos(L, 2);
+
+	if (sao->getType() == ACTIVEOBJECT_TYPE_LUAENTITY) {
+		LuaEntitySAO *entitysao = dynamic_cast<LuaEntitySAO*>(sao);
+		entitysao->addVelocity(vel);
+	} else if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+		PlayerSAO *playersao = dynamic_cast<PlayerSAO*>(sao);
+		playersao->setMaxSpeedOverride(vel);
+		getServer(L)->SendPlayerSpeed(playersao->getPeerID(), vel);
+	}
+
 	return 0;
 }
 
@@ -877,25 +804,37 @@ int ObjectRef::l_get_velocity(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	v3f v = co->getVelocity();
-	pushFloatPos(L, v);
+	ServerActiveObject *sao = getobject(ref);
+	if (sao == nullptr)
+		return 0;
+
+	if (sao->getType() == ACTIVEOBJECT_TYPE_LUAENTITY) {
+		LuaEntitySAO *entitysao = dynamic_cast<LuaEntitySAO*>(sao);
+		v3f vel = entitysao->getVelocity();
+		pushFloatPos(L, vel);
+		return 1;
+	} else if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+		RemotePlayer *player = dynamic_cast<PlayerSAO*>(sao)->getPlayer();
+		push_v3f(L, player->getSpeed() / BS);
+		return 1;
+	}
+
+	lua_pushnil(L);
 	return 1;
 }
 
-// set_acceleration(self, {x=num, y=num, z=num})
+// set_acceleration(self, acceleration)
 int ObjectRef::l_set_acceleration(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	// pos
-	v3f pos = checkFloatPos(L, 2);
-	// Do it
-	co->setAcceleration(pos);
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
+		return 0;
+
+	v3f acceleration = checkFloatPos(L, 2);
+
+	entitysao->setAcceleration(acceleration);
 	return 0;
 }
 
@@ -904,59 +843,61 @@ int ObjectRef::l_get_acceleration(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	v3f v = co->getAcceleration();
-	pushFloatPos(L, v);
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
+		return 0;
+
+	v3f acceleration = entitysao->getAcceleration();
+	pushFloatPos(L, acceleration);
 	return 1;
 }
 
-// set_rotation(self, {x=num, y=num, z=num})
-// Each 'num' is in radians
+// set_rotation(self, rotation)
 int ObjectRef::l_set_rotation(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (!co)
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
 		return 0;
 
 	v3f rotation = check_v3f(L, 2) * core::RADTODEG;
-	co->setRotation(rotation);
+
+	entitysao->setRotation(rotation);
 	return 0;
 }
 
 // get_rotation(self)
-// returns: {x=num, y=num, z=num}
-// Each 'num' is in radians
 int ObjectRef::l_get_rotation(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (!co)
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
 		return 0;
 
+	v3f rotation = entitysao->getRotation() * core::DEGTORAD;
+
 	lua_newtable(L);
-	v3f rotation = co->getRotation() * core::DEGTORAD;
 	push_v3f(L, rotation);
 	return 1;
 }
 
-// set_yaw(self, radians)
+// set_yaw(self, yaw)
 int ObjectRef::l_set_yaw(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
+		return 0;
 
-	if (co == NULL) return 0;
 	if (isNaN(L, 2))
 		throw LuaError("ObjectRef::set_yaw: NaN value is not allowed.");
 
 	float yaw = readParam<float>(L, 2) * core::RADTODEG;
-	co->setRotation(v3f(0, yaw, 0));
+
+	entitysao->setRotation(v3f(0, yaw, 0));
 	return 0;
 }
 
@@ -965,11 +906,12 @@ int ObjectRef::l_get_yaw(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (!co)
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
 		return 0;
 
-	float yaw = co->getRotation().Y * core::DEGTORAD;
+	float yaw = entitysao->getRotation().Y * core::DEGTORAD;
+
 	lua_pushnumber(L, yaw);
 	return 1;
 }
@@ -979,11 +921,13 @@ int ObjectRef::l_set_texture_mod(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	std::string mod = luaL_checkstring(L, 2);
-	co->setTextureMod(mod);
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
+		return 0;
+
+	std::string mod = readParam<std::string>(L, 2);
+
+	entitysao->setTextureMod(mod);
 	return 0;
 }
 
@@ -992,36 +936,31 @@ int ObjectRef::l_get_texture_mod(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	std::string mod = co->getTextureMod();
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
+		return 0;
+
+	std::string mod = entitysao->getTextureMod();
+
 	lua_pushstring(L, mod.c_str());
 	return 1;
 }
 
-// set_sprite(self, p={x=0,y=0}, num_frames=1, framelength=0.2,
-//           select_horiz_by_yawpitch=false)
+// set_sprite(self, start_frame, num_frames, framelength, select_x_by_camera)
 int ObjectRef::l_set_sprite(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	v2s16 p(0,0);
-	if (!lua_isnil(L, 2))
-		p = readParam<v2s16>(L, 2);
-	int num_frames = 1;
-	if (!lua_isnil(L, 3))
-		num_frames = lua_tonumber(L, 3);
-	float framelength = 0.2;
-	if (!lua_isnil(L, 4))
-		framelength = lua_tonumber(L, 4);
-	bool select_horiz_by_yawpitch = false;
-	if (!lua_isnil(L, 5))
-		select_horiz_by_yawpitch = readParam<bool>(L, 5);
-	co->setSprite(p, num_frames, framelength, select_horiz_by_yawpitch);
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
+		return 0;
+
+	v2s16 start_frame = readParam<v2s16>(L, 2, v2s16(0,0));
+	int num_frames    = readParam<int>(L, 3, 1);
+	float framelength = readParam<float>(L, 4, 0.2f);
+	bool select_x_by_camera = readParam<bool>(L, 5, false);
+
+	entitysao->setSprite(start_frame, num_frames, framelength, select_x_by_camera);
 	return 0;
 }
 
@@ -1031,11 +970,13 @@ int ObjectRef::l_get_entity_name(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
+	LuaEntitySAO *entitysao = getluaobject(ref);
 	log_deprecated(L,"Deprecated call to \"get_entity_name");
-	if (co == NULL) return 0;
-	// Do it
-	std::string name = co->getName();
+	if (entitysao == nullptr)
+		return 0;
+
+	std::string name = entitysao->getName();
+
 	lua_pushstring(L, name.c_str());
 	return 1;
 }
@@ -1045,87 +986,45 @@ int ObjectRef::l_get_luaentity(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	LuaEntitySAO *co = getluaobject(ref);
-	if (co == NULL) return 0;
-	// Do it
-	luaentity_get(L, co->getId());
+	LuaEntitySAO *entitysao = getluaobject(ref);
+	if (entitysao == nullptr)
+		return 0;
+
+	luaentity_get(L, entitysao->getId());
 	return 1;
 }
 
 /* Player-only */
 
-// is_player_connected(self)
-int ObjectRef::l_is_player_connected(lua_State *L)
-{
-	NO_MAP_LOCK_REQUIRED;
-	// This method was once added for a bugfix, but never documented
-	log_deprecated(L, "is_player_connected is undocumented and "
-		"will be removed in a future release");
-	ObjectRef *ref = checkobject(L, 1);
-	RemotePlayer *player = getplayer(ref);
-	lua_pushboolean(L, (player != NULL && player->getPeerId() != PEER_ID_INEXISTENT));
-	return 1;
-}
-
 // get_player_name(self)
 int ObjectRef::l_get_player_name(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) {
+	if (player == nullptr) {
 		lua_pushlstring(L, "", 0);
 		return 1;
 	}
-	// Do it
-	lua_pushstring(L, player->getName());
-	return 1;
-}
 
-// get_player_velocity(self)
-int ObjectRef::l_get_player_velocity(lua_State *L)
-{
-	NO_MAP_LOCK_REQUIRED;
-	ObjectRef *ref = checkobject(L, 1);
-	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) {
-		lua_pushnil(L);
-		return 1;
-	}
-	// Do it
-	push_v3f(L, player->getSpeed() / BS);
+	lua_pushstring(L, player->getName());
 	return 1;
 }
 
-// add_player_velocity(self, {x=num, y=num, z=num})
-int ObjectRef::l_add_player_velocity(lua_State *L)
-{
-	NO_MAP_LOCK_REQUIRED;
-	ObjectRef *ref = checkobject(L, 1);
-	v3f vel = checkFloatPos(L, 2);
-
-	PlayerSAO *co = getplayersao(ref);
-	if (!co)
-		return 0;
-
-	// Do it
-	co->setMaxSpeedOverride(vel);
-	getServer(L)->SendPlayerSpeed(co->getPeerID(), vel);
-	return 0;
-}
-
 // get_look_dir(self)
 int ObjectRef::l_get_look_dir(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
-	// Do it
-	float pitch = co->getRadLookPitchDep();
-	float yaw = co->getRadYawDep();
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	float pitch = playersao->getRadLookPitchDep();
+	float yaw = playersao->getRadYawDep();
 	v3f v(std::cos(pitch) * std::cos(yaw), std::sin(pitch), std::cos(pitch) *
 		std::sin(yaw));
+
 	push_v3f(L, v);
 	return 1;
 }
@@ -1140,10 +1039,11 @@ int ObjectRef::l_get_look_pitch(lua_State *L)
 		"Deprecated call to get_look_pitch, use get_look_vertical instead");
 
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
-	// Do it
-	lua_pushnumber(L, co->getRadLookPitchDep());
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	lua_pushnumber(L, playersao->getRadLookPitchDep());
 	return 1;
 }
 
@@ -1157,34 +1057,37 @@ int ObjectRef::l_get_look_yaw(lua_State *L)
 		"Deprecated call to get_look_yaw, use get_look_horizontal instead");
 
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
-	// Do it
-	lua_pushnumber(L, co->getRadYawDep());
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	lua_pushnumber(L, playersao->getRadYawDep());
 	return 1;
 }
 
-// get_look_pitch2(self)
+// get_look_vertical(self)
 int ObjectRef::l_get_look_vertical(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
-	// Do it
-	lua_pushnumber(L, co->getRadLookPitch());
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	lua_pushnumber(L, playersao->getRadLookPitch());
 	return 1;
 }
 
-// get_look_yaw2(self)
+// get_look_horizontal(self)
 int ObjectRef::l_get_look_horizontal(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
-	// Do it
-	lua_pushnumber(L, co->getRadRotation().Y);
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	lua_pushnumber(L, playersao->getRadRotation().Y);
 	return 1;
 }
 
@@ -1193,11 +1096,13 @@ int ObjectRef::l_set_look_vertical(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
 	float pitch = readParam<float>(L, 2) * core::RADTODEG;
-	// Do it
-	co->setLookPitchAndSend(pitch);
+
+	playersao->setLookPitchAndSend(pitch);
 	return 1;
 }
 
@@ -1206,11 +1111,13 @@ int ObjectRef::l_set_look_horizontal(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
 	float yaw = readParam<float>(L, 2) * core::RADTODEG;
-	// Do it
-	co->setPlayerYawAndSend(yaw);
+
+	playersao->setPlayerYawAndSend(yaw);
 	return 1;
 }
 
@@ -1224,11 +1131,13 @@ int ObjectRef::l_set_look_pitch(lua_State *L)
 		"Deprecated call to set_look_pitch, use set_look_vertical instead.");
 
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
 	float pitch = readParam<float>(L, 2) * core::RADTODEG;
-	// Do it
-	co->setLookPitchAndSend(pitch);
+
+	playersao->setLookPitchAndSend(pitch);
 	return 1;
 }
 
@@ -1242,30 +1151,32 @@ int ObjectRef::l_set_look_yaw(lua_State *L)
 		"Deprecated call to set_look_yaw, use set_look_horizontal instead.");
 
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
 	float yaw = readParam<float>(L, 2) * core::RADTODEG;
-	// Do it
-	co->setPlayerYawAndSend(yaw);
+
+	playersao->setPlayerYawAndSend(yaw);
 	return 1;
 }
 
-// set_fov(self, degrees[, is_multiplier, transition_time])
+// set_fov(self, degrees, is_multiplier, transition_time)
 int ObjectRef::l_set_fov(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
 
-	player->setFov({
-		static_cast<f32>(luaL_checknumber(L, 2)),
-		readParam<bool>(L, 3, false),
-		lua_isnumber(L, 4) ? static_cast<f32>(luaL_checknumber(L, 4)) : 0.0f
-	});
-	getServer(L)->SendPlayerFov(player->getPeerId());
+	float degrees = static_cast<f32>(luaL_checknumber(L, 2));
+	bool is_multiplier = readParam<bool>(L, 3, false);
+	float transition_time = lua_isnumber(L, 4) ?
+		static_cast<f32>(luaL_checknumber(L, 4)) : 0.0f;
 
+	player->setFov({degrees, is_multiplier, transition_time});
+	getServer(L)->SendPlayerFov(player->getPeerId());
 	return 0;
 }
 
@@ -1275,14 +1186,14 @@ int ObjectRef::l_get_fov(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
 
 	PlayerFovSpec fov_spec = player->getFov();
+
 	lua_pushnumber(L, fov_spec.fov);
 	lua_pushboolean(L, fov_spec.is_multiplier);
 	lua_pushnumber(L, fov_spec.transition_time);
-
 	return 3;
 }
 
@@ -1291,11 +1202,13 @@ int ObjectRef::l_set_breath(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
 	u16 breath = luaL_checknumber(L, 2);
-	co->setBreath(breath);
 
+	playersao->setBreath(breath);
 	return 0;
 }
 
@@ -1304,11 +1217,13 @@ int ObjectRef::l_get_breath(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL) return 0;
-	// Do it
-	u16 breath = co->getBreath();
-	lua_pushinteger (L, breath);
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	u16 breath = playersao->getBreath();
+
+	lua_pushinteger(L, breath);
 	return 1;
 }
 
@@ -1319,16 +1234,16 @@ int ObjectRef::l_set_attribute(lua_State *L)
 		"Deprecated call to set_attribute, use MetaDataRef methods instead.");
 
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL)
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
 		return 0;
 
 	std::string attr = luaL_checkstring(L, 2);
 	if (lua_isnil(L, 3)) {
-		co->getMeta().removeString(attr);
+		playersao->getMeta().removeString(attr);
 	} else {
 		std::string value = luaL_checkstring(L, 3);
-		co->getMeta().setString(attr, value);
+		playersao->getMeta().setString(attr, value);
 	}
 	return 1;
 }
@@ -1340,14 +1255,14 @@ int ObjectRef::l_get_attribute(lua_State *L)
 		"Deprecated call to get_attribute, use MetaDataRef methods instead.");
 
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO* co = getplayersao(ref);
-	if (co == NULL)
+	PlayerSAO* playersao = getplayersao(ref);
+	if (playersao == nullptr)
 		return 0;
 
 	std::string attr = luaL_checkstring(L, 2);
 
 	std::string value;
-	if (co->getMeta().getStringToRef(attr, value)) {
+	if (playersao->getMeta().getStringToRef(attr, value)) {
 		lua_pushstring(L, value.c_str());
 		return 1;
 	}
@@ -1360,11 +1275,11 @@ int ObjectRef::l_get_attribute(lua_State *L)
 int ObjectRef::l_get_meta(lua_State *L)
 {
 	ObjectRef *ref = checkobject(L, 1);
-	PlayerSAO *co = getplayersao(ref);
-	if (co == NULL)
+	PlayerSAO *playersao = getplayersao(ref);
+	if (playersao == nullptr)
 		return 0;
 
-	PlayerMetaRef::create(L, &co->getMeta());
+	PlayerMetaRef::create(L, &playersao->getMeta());
 	return 1;
 }
 
@@ -1375,7 +1290,9 @@ int ObjectRef::l_set_inventory_formspec(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) return 0;
+	if (player == nullptr)
+		return 0;
+
 	std::string formspec = luaL_checkstring(L, 2);
 
 	player->inventory_formspec = formspec;
@@ -1390,9 +1307,11 @@ int ObjectRef::l_get_inventory_formspec(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) return 0;
+	if (player == nullptr)
+		return 0;
 
 	std::string formspec = player->inventory_formspec;
+
 	lua_pushlstring(L, formspec.c_str(), formspec.size());
 	return 1;
 }
@@ -1403,7 +1322,7 @@ int ObjectRef::l_set_formspec_prepend(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	std::string formspec = luaL_checkstring(L, 2);
@@ -1414,16 +1333,17 @@ int ObjectRef::l_set_formspec_prepend(lua_State *L)
 	return 1;
 }
 
-// get_formspec_prepend(self) -> formspec
+// get_formspec_prepend(self)
 int ObjectRef::l_get_formspec_prepend(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		 return 0;
 
 	std::string formspec = player->formspec_prepend;
+
 	lua_pushlstring(L, formspec.c_str(), formspec.size());
 	return 1;
 }
@@ -1434,7 +1354,7 @@ int ObjectRef::l_get_player_control(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) {
+	if (player == nullptr) {
 		lua_pushlstring(L, "", 0);
 		return 1;
 	}
@@ -1455,9 +1375,14 @@ int ObjectRef::l_get_player_control(lua_State *L)
 	lua_setfield(L, -2, "aux1");
 	lua_pushboolean(L, control.sneak);
 	lua_setfield(L, -2, "sneak");
-	lua_pushboolean(L, control.LMB);
+	lua_pushboolean(L, control.dig);
+	lua_setfield(L, -2, "dig");
+	lua_pushboolean(L, control.place);
+	lua_setfield(L, -2, "place");
+	// Legacy fields to ensure mod compatibility
+	lua_pushboolean(L, control.dig);
 	lua_setfield(L, -2, "LMB");
-	lua_pushboolean(L, control.RMB);
+	lua_pushboolean(L, control.place);
 	lua_setfield(L, -2, "RMB");
 	lua_pushboolean(L, control.zoom);
 	lua_setfield(L, -2, "zoom");
@@ -1470,22 +1395,87 @@ int ObjectRef::l_get_player_control_bits(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL) {
+	if (player == nullptr) {
 		lua_pushlstring(L, "", 0);
 		return 1;
 	}
-	// Do it
+
 	lua_pushnumber(L, player->keyPressed);
 	return 1;
 }
 
-// hud_add(self, form)
+// set_physics_override(self, override_table)
+int ObjectRef::l_set_physics_override(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkobject(L, 1);
+	PlayerSAO *playersao = (PlayerSAO *) getobject(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	if (lua_istable(L, 2)) {
+		bool modified = false;
+		modified |= getfloatfield(L, 2, "speed", playersao->m_physics_override_speed);
+		modified |= getfloatfield(L, 2, "jump", playersao->m_physics_override_jump);
+		modified |= getfloatfield(L, 2, "gravity", playersao->m_physics_override_gravity);
+		modified |= getboolfield(L, 2, "sneak", playersao->m_physics_override_sneak);
+		modified |= getboolfield(L, 2, "sneak_glitch", playersao->m_physics_override_sneak_glitch);
+		modified |= getboolfield(L, 2, "new_move", playersao->m_physics_override_new_move);
+		if (modified)
+			playersao->m_physics_override_sent = false;
+	} else {
+		// old, non-table format
+		// TODO: Remove this code after version 5.4.0
+		log_deprecated(L, "Deprecated use of set_physics_override(num, num, num)");
+
+		if (!lua_isnil(L, 2)) {
+			playersao->m_physics_override_speed = lua_tonumber(L, 2);
+			playersao->m_physics_override_sent = false;
+		}
+		if (!lua_isnil(L, 3)) {
+			playersao->m_physics_override_jump = lua_tonumber(L, 3);
+			playersao->m_physics_override_sent = false;
+		}
+		if (!lua_isnil(L, 4)) {
+			playersao->m_physics_override_gravity = lua_tonumber(L, 4);
+			playersao->m_physics_override_sent = false;
+		}
+	}
+	return 0;
+}
+
+// get_physics_override(self)
+int ObjectRef::l_get_physics_override(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkobject(L, 1);
+	PlayerSAO *playersao = (PlayerSAO *)getobject(ref);
+	if (playersao == nullptr)
+		return 0;
+
+	lua_newtable(L);
+	lua_pushnumber(L, playersao->m_physics_override_speed);
+	lua_setfield(L, -2, "speed");
+	lua_pushnumber(L, playersao->m_physics_override_jump);
+	lua_setfield(L, -2, "jump");
+	lua_pushnumber(L, playersao->m_physics_override_gravity);
+	lua_setfield(L, -2, "gravity");
+	lua_pushboolean(L, playersao->m_physics_override_sneak);
+	lua_setfield(L, -2, "sneak");
+	lua_pushboolean(L, playersao->m_physics_override_sneak_glitch);
+	lua_setfield(L, -2, "sneak_glitch");
+	lua_pushboolean(L, playersao->m_physics_override_new_move);
+	lua_setfield(L, -2, "new_move");
+	return 1;
+}
+
+// hud_add(self, hud)
 int ObjectRef::l_hud_add(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	HudElement *elem = new HudElement;
@@ -1507,12 +1497,10 @@ int ObjectRef::l_hud_remove(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
-	u32 id = -1;
-	if (!lua_isnil(L, 2))
-		id = lua_tonumber(L, 2);
+	u32 id = luaL_checkint(L, 2);
 
 	if (!getServer(L)->hudRemove(player, id))
 		return 0;
@@ -1527,17 +1515,17 @@ int ObjectRef::l_hud_change(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
-	u32 id = lua_isnumber(L, 2) ? lua_tonumber(L, 2) : -1;
+	u32 id = luaL_checkint(L, 2);
 
-	HudElement *e = player->getHud(id);
-	if (!e)
+	HudElement *elem = player->getHud(id);
+	if (elem == nullptr)
 		return 0;
 
-	void *value = NULL;
-	HudElementStat stat = read_hud_change(L, e, &value);
+	void *value = nullptr;
+	HudElementStat stat = read_hud_change(L, elem, &value);
 
 	getServer(L)->hudChange(player, id, stat, value);
 
@@ -1551,15 +1539,16 @@ int ObjectRef::l_hud_get(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
-	u32 id = lua_tonumber(L, -1);
+	u32 id = luaL_checkint(L, 2);
 
-	HudElement *e = player->getHud(id);
-	if (!e)
+	HudElement *elem = player->getHud(id);
+	if (elem == nullptr)
 		return 0;
-	push_hud_element(L, e);
+
+	push_hud_element(L, elem);
 	return 1;
 }
 
@@ -1569,7 +1558,7 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	u32 flags = 0;
@@ -1590,12 +1579,13 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
 	return 1;
 }
 
+// hud_get_flags(self)
 int ObjectRef::l_hud_get_flags(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	lua_newtable(L);
@@ -1613,7 +1603,6 @@ int ObjectRef::l_hud_get_flags(lua_State *L)
 	lua_setfield(L, -2, "minimap");
 	lua_pushboolean(L, player->hud_flags & HUD_FLAG_MINIMAP_RADAR_VISIBLE);
 	lua_setfield(L, -2, "minimap_radar");
-
 	return 1;
 }
 
@@ -1623,10 +1612,10 @@ int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
-	s32 hotbar_itemcount = lua_tonumber(L, 2);
+	s32 hotbar_itemcount = luaL_checkint(L, 2);
 
 	if (!getServer(L)->hudSetHotbarItemcount(player, hotbar_itemcount))
 		return 0;
@@ -1641,7 +1630,7 @@ int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	lua_pushnumber(L, player->getHotbarItemcount());
@@ -1654,7 +1643,7 @@ int ObjectRef::l_hud_set_hotbar_image(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	std::string name = readParam<std::string>(L, 2);
@@ -1669,10 +1658,11 @@ int ObjectRef::l_hud_get_hotbar_image(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	const std::string &name = player->getHotbarImage();
+
 	lua_pushlstring(L, name.c_str(), name.size());
 	return 1;
 }
@@ -1683,7 +1673,7 @@ int ObjectRef::l_hud_set_hotbar_selected_image(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	std::string name = readParam<std::string>(L, 2);
@@ -1698,44 +1688,45 @@ int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	const std::string &name = player->getHotbarSelectedImage();
+
 	lua_pushlstring(L, name.c_str(), name.size());
 	return 1;
 }
 
-// set_sky(self, {base_color=, type=, textures=, clouds=, sky_colors={}})
+// set_sky(self, sky_parameters)
 int ObjectRef::l_set_sky(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
 
+	SkyboxParams sky_params = player->getSkyParams();
 	bool is_colorspec = is_color_table(L, 2);
 
-	SkyboxParams skybox_params = player->getSkyParams();
 	if (lua_istable(L, 2) && !is_colorspec) {
 		lua_getfield(L, 2, "base_color");
 		if (!lua_isnil(L, -1))
-			read_color(L, -1, &skybox_params.bgcolor);
+			read_color(L, -1, &sky_params.bgcolor);
 		lua_pop(L, 1);
 
 		lua_getfield(L, 2, "type");
 		if (!lua_isnil(L, -1))
-			skybox_params.type = luaL_checkstring(L, -1);
+			sky_params.type = luaL_checkstring(L, -1);
 		lua_pop(L, 1);
 
 		lua_getfield(L, 2, "textures");
-		skybox_params.textures.clear();
-		if (lua_istable(L, -1) && skybox_params.type == "skybox") {
+		sky_params.textures.clear();
+		if (lua_istable(L, -1) && sky_params.type == "skybox") {
 			lua_pushnil(L);
 			while (lua_next(L, -2) != 0) {
 				// Key is at index -2 and value at index -1
-				skybox_params.textures.emplace_back(readParam<std::string>(L, -1));
+				sky_params.textures.emplace_back(readParam<std::string>(L, -1));
 				// Removes the value, but keeps the key for iteration
 				lua_pop(L, 1);
 			}
@@ -1748,56 +1739,56 @@ int ObjectRef::l_set_sky(lua_State *L)
 		using "regular" or "plain" skybox modes as textures aren't needed.
 		*/
 
-		if (skybox_params.textures.size() != 6 && skybox_params.textures.size() > 0)
+		if (sky_params.textures.size() != 6 && sky_params.textures.size() > 0)
 			throw LuaError("Skybox expects 6 textures!");
 
-		skybox_params.clouds = getboolfield_default(L, 2,
-			"clouds", skybox_params.clouds);
+		sky_params.clouds = getboolfield_default(L, 2,
+			"clouds", sky_params.clouds);
 
 		lua_getfield(L, 2, "sky_color");
 		if (lua_istable(L, -1)) {
 			lua_getfield(L, -1, "day_sky");
-			read_color(L, -1, &skybox_params.sky_color.day_sky);
+			read_color(L, -1, &sky_params.sky_color.day_sky);
 			lua_pop(L, 1);
 
 			lua_getfield(L, -1, "day_horizon");
-			read_color(L, -1, &skybox_params.sky_color.day_horizon);
+			read_color(L, -1, &sky_params.sky_color.day_horizon);
 			lua_pop(L, 1);
 
 			lua_getfield(L, -1, "dawn_sky");
-			read_color(L, -1, &skybox_params.sky_color.dawn_sky);
+			read_color(L, -1, &sky_params.sky_color.dawn_sky);
 			lua_pop(L, 1);
 
 			lua_getfield(L, -1, "dawn_horizon");
-			read_color(L, -1, &skybox_params.sky_color.dawn_horizon);
+			read_color(L, -1, &sky_params.sky_color.dawn_horizon);
 			lua_pop(L, 1);
 
 			lua_getfield(L, -1, "night_sky");
-			read_color(L, -1, &skybox_params.sky_color.night_sky);
+			read_color(L, -1, &sky_params.sky_color.night_sky);
 			lua_pop(L, 1);
 
 			lua_getfield(L, -1, "night_horizon");
-			read_color(L, -1, &skybox_params.sky_color.night_horizon);
+			read_color(L, -1, &sky_params.sky_color.night_horizon);
 			lua_pop(L, 1);
 
 			lua_getfield(L, -1, "indoors");
-			read_color(L, -1, &skybox_params.sky_color.indoors);
+			read_color(L, -1, &sky_params.sky_color.indoors);
 			lua_pop(L, 1);
 
 			// Prevent flickering clouds at dawn/dusk:
-			skybox_params.fog_sun_tint = video::SColor(255, 255, 255, 255);
+			sky_params.fog_sun_tint = video::SColor(255, 255, 255, 255);
 			lua_getfield(L, -1, "fog_sun_tint");
-			read_color(L, -1, &skybox_params.fog_sun_tint);
+			read_color(L, -1, &sky_params.fog_sun_tint);
 			lua_pop(L, 1);
 
-			skybox_params.fog_moon_tint = video::SColor(255, 255, 255, 255);
+			sky_params.fog_moon_tint = video::SColor(255, 255, 255, 255);
 			lua_getfield(L, -1, "fog_moon_tint");
-			read_color(L, -1, &skybox_params.fog_moon_tint);
+			read_color(L, -1, &sky_params.fog_moon_tint);
 			lua_pop(L, 1);
 
 			lua_getfield(L, -1, "fog_tint_type");
 			if (!lua_isnil(L, -1))
-				skybox_params.fog_tint_type = luaL_checkstring(L, -1);
+				sky_params.fog_tint_type = luaL_checkstring(L, -1);
 			lua_pop(L, 1);
 
 			// Because we need to leave the "sky_color" table.
@@ -1813,14 +1804,14 @@ int ObjectRef::l_set_sky(lua_State *L)
 		StarParams star_params = player->getStarParams();
 
 		// Prevent erroneous background colors
-		skybox_params.bgcolor = video::SColor(255, 255, 255, 255);
-		read_color(L, 2, &skybox_params.bgcolor);
+		sky_params.bgcolor = video::SColor(255, 255, 255, 255);
+		read_color(L, 2, &sky_params.bgcolor);
 
-		skybox_params.type = luaL_checkstring(L, 3);
+		sky_params.type = luaL_checkstring(L, 3);
 
 		// Preserve old behaviour of the sun, moon and stars
 		// when using the old set_sky call.
-		if (skybox_params.type == "regular") {
+		if (sky_params.type == "regular") {
 			sun_params.visible = true;
 			sun_params.sunrise_visible = true;
 			moon_params.visible = true;
@@ -1832,31 +1823,31 @@ int ObjectRef::l_set_sky(lua_State *L)
 			star_params.visible = false;
 		}
 
-		skybox_params.textures.clear();
+		sky_params.textures.clear();
 		if (lua_istable(L, 4)) {
 			lua_pushnil(L);
 			while (lua_next(L, 4) != 0) {
 			// Key at index -2, and value at index -1
 				if (lua_isstring(L, -1))
-					skybox_params.textures.emplace_back(readParam<std::string>(L, -1));
+					sky_params.textures.emplace_back(readParam<std::string>(L, -1));
 				else
-					skybox_params.textures.emplace_back("");
+					sky_params.textures.emplace_back("");
 				// Remove the value, keep the key for the next iteration
 				lua_pop(L, 1);
 			}
 		}
-		if (skybox_params.type == "skybox" && skybox_params.textures.size() != 6)
+		if (sky_params.type == "skybox" && sky_params.textures.size() != 6)
 			throw LuaError("Skybox expects 6 textures.");
 
-		skybox_params.clouds = true;
+		sky_params.clouds = true;
 		if (lua_isboolean(L, 5))
-			skybox_params.clouds = readParam<bool>(L, 5);
+			sky_params.clouds = readParam<bool>(L, 5);
 
 		getServer(L)->setSun(player, sun_params);
 		getServer(L)->setMoon(player, moon_params);
 		getServer(L)->setStars(player, star_params);
 	}
-	getServer(L)->setSky(player, skybox_params);
+	getServer(L)->setSky(player, sky_params);
 	lua_pushboolean(L, true);
 	return 1;
 }
@@ -1867,18 +1858,17 @@ int ObjectRef::l_get_sky(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-
-	if (!player)
+	if (player == nullptr)
 		return 0;
-	SkyboxParams skybox_params;
-	skybox_params = player->getSkyParams();
+
+	SkyboxParams skybox_params = player->getSkyParams();
 
 	push_ARGB8(L, skybox_params.bgcolor);
 	lua_pushlstring(L, skybox_params.type.c_str(), skybox_params.type.size());
 
 	lua_newtable(L);
 	s16 i = 1;
-	for (const std::string& texture : skybox_params.textures) {
+	for (const std::string &texture : skybox_params.textures) {
 		lua_pushlstring(L, texture.c_str(), texture.size());
 		lua_rawseti(L, -2, i++);
 	}
@@ -1892,11 +1882,10 @@ int ObjectRef::l_get_sky_color(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-
-	if (!player)
+	if (player == nullptr)
 		return 0;
 
-	const SkyboxParams& skybox_params = player->getSkyParams();
+	const SkyboxParams &skybox_params = player->getSkyParams();
 
 	lua_newtable(L);
 	if (skybox_params.type == "regular") {
@@ -1924,18 +1913,16 @@ int ObjectRef::l_get_sky_color(lua_State *L)
 	return 1;
 }
 
-// set_sun(self, {visible, texture=, tonemap=, sunrise=, rotation=, scale=})
+// set_sun(self, sun_parameters)
 int ObjectRef::l_set_sun(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
-		return 0;
-
-	if (!lua_istable(L, 2))
+	if (player == nullptr)
 		return 0;
 
+	luaL_checktype(L, 2, LUA_TTABLE);
 	SunParams sun_params = player->getSunParams();
 
 	sun_params.visible = getboolfield_default(L, 2,
@@ -1962,8 +1949,9 @@ int ObjectRef::l_get_sun(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
+
 	const SunParams &sun_params = player->getSunParams();
 
 	lua_newtable(L);
@@ -1979,21 +1967,19 @@ int ObjectRef::l_get_sun(lua_State *L)
 	lua_setfield(L, -2, "sunrise_visible");
 	lua_pushnumber(L, sun_params.scale);
 	lua_setfield(L, -2, "scale");
-
 	return 1;
 }
 
-// set_moon(self, {visible, texture=, tonemap=, sunrise=, rotation=, scale=})
+// set_moon(self, moon_parameters)
 int ObjectRef::l_set_moon(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
-		return 0;
-	if (!lua_istable(L, 2))
+	if (player == nullptr)
 		return 0;
 
+	luaL_checktype(L, 2, LUA_TTABLE);
 	MoonParams moon_params = player->getMoonParams();
 
 	moon_params.visible = getboolfield_default(L, 2,
@@ -2016,8 +2002,9 @@ int ObjectRef::l_get_moon(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
+
 	const MoonParams &moon_params = player->getMoonParams();
 
 	lua_newtable(L);
@@ -2029,21 +2016,19 @@ int ObjectRef::l_get_moon(lua_State *L)
 	lua_setfield(L, -2, "tonemap");
 	lua_pushnumber(L, moon_params.scale);
 	lua_setfield(L, -2, "scale");
-
 	return 1;
 }
 
-// set_stars(self, {visible, count=, starcolor=, rotation=, scale=})
+// set_stars(self, star_parameters)
 int ObjectRef::l_set_stars(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
-		return 0;
-	if (!lua_istable(L, 2))
+	if (player == nullptr)
 		return 0;
 
+	luaL_checktype(L, 2, LUA_TTABLE);
 	StarParams star_params = player->getStarParams();
 
 	star_params.visible = getboolfield_default(L, 2,
@@ -2070,8 +2055,9 @@ int ObjectRef::l_get_stars(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
+
 	const StarParams &star_params = player->getStarParams();
 
 	lua_newtable(L);
@@ -2083,21 +2069,19 @@ int ObjectRef::l_get_stars(lua_State *L)
 	lua_setfield(L, -2, "star_color");
 	lua_pushnumber(L, star_params.scale);
 	lua_setfield(L, -2, "scale");
-
 	return 1;
 }
 
-// set_clouds(self, {density=, color=, ambient=, height=, thickness=, speed=})
+// set_clouds(self, cloud_parameters)
 int ObjectRef::l_set_clouds(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
-		return 0;
-	if (!lua_istable(L, 2))
+	if (player == nullptr)
 		return 0;
 
+	luaL_checktype(L, 2, LUA_TTABLE);
 	CloudParams cloud_params = player->getCloudParams();
 
 	cloud_params.density = getfloatfield_default(L, 2, "density", cloud_params.density);
@@ -2133,8 +2117,9 @@ int ObjectRef::l_get_clouds(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (!player)
+	if (player == nullptr)
 		return 0;
+
 	const CloudParams &cloud_params = player->getCloudParams();
 
 	lua_newtable(L);
@@ -2154,25 +2139,27 @@ int ObjectRef::l_get_clouds(lua_State *L)
 	lua_pushnumber(L, cloud_params.speed.Y);
 	lua_setfield(L, -2, "y");
 	lua_setfield(L, -2, "speed");
-
 	return 1;
 }
 
 
-// override_day_night_ratio(self, brightness=0...1)
+// override_day_night_ratio(self, ratio)
 int ObjectRef::l_override_day_night_ratio(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	bool do_override = false;
 	float ratio = 0.0f;
+
 	if (!lua_isnil(L, 2)) {
 		do_override = true;
 		ratio = readParam<float>(L, 2);
+		luaL_argcheck(L, ratio >= 0.0f && ratio <= 1.0f, 1,
+			"value must be between 0 and 1");
 	}
 
 	getServer(L)->overrideDayNightRatio(player, do_override, ratio);
@@ -2186,7 +2173,7 @@ int ObjectRef::l_get_day_night_ratio(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkobject(L, 1);
 	RemotePlayer *player = getplayer(ref);
-	if (player == NULL)
+	if (player == nullptr)
 		return 0;
 
 	bool do_override;
@@ -2201,27 +2188,77 @@ int ObjectRef::l_get_day_night_ratio(lua_State *L)
 	return 1;
 }
 
-ObjectRef::ObjectRef(ServerActiveObject *object):
-	m_object(object)
+// set_minimap_modes(self, modes, selected_mode)
+int ObjectRef::l_set_minimap_modes(lua_State *L)
 {
-	//infostream<<"ObjectRef created for id="<<m_object->getId()<<std::endl;
+	NO_MAP_LOCK_REQUIRED;
+	ObjectRef *ref = checkobject(L, 1);
+	RemotePlayer *player = getplayer(ref);
+	if (player == nullptr)
+		return 0;
+
+	luaL_checktype(L, 2, LUA_TTABLE);
+	std::vector<MinimapMode> modes;
+	s16 selected_mode = luaL_checkint(L, 3);
+
+	lua_pushnil(L);
+	while (lua_next(L, 2) != 0) {
+		/* key is at index -2, value is at index -1 */
+		if (lua_istable(L, -1)) {
+			bool ok = true;
+			MinimapMode mode;
+			std::string type = getstringfield_default(L, -1, "type", "");
+			if (type == "off")
+				mode.type = MINIMAP_TYPE_OFF;
+			else if (type == "surface")
+				mode.type = MINIMAP_TYPE_SURFACE;
+			else if (type == "radar")
+				mode.type = MINIMAP_TYPE_RADAR;
+			else if (type == "texture") {
+				mode.type = MINIMAP_TYPE_TEXTURE;
+				mode.texture = getstringfield_default(L, -1, "texture", "");
+				mode.scale = getintfield_default(L, -1, "scale", 1);
+			} else {
+				warningstream << "Minimap mode of unknown type \"" << type.c_str()
+					<< "\" ignored.\n" << std::endl;
+				ok = false;
+			}
+
+			if (ok) {
+				mode.label = getstringfield_default(L, -1, "label", "");
+				// Size is limited to 512. Performance gets poor if size too large, and
+				// segfaults have been experienced.
+				mode.size = rangelim(getintfield_default(L, -1, "size", 0), 1, 512);
+				modes.push_back(mode);
+			}
+		}
+		/* removes 'value'; keeps 'key' for next iteration */
+		lua_pop(L, 1);
+	}
+	lua_pop(L, 1); // Remove key
+
+	getServer(L)->SendMinimapModes(player->getPeerId(), modes, selected_mode);
+	return 0;
 }
 
+ObjectRef::ObjectRef(ServerActiveObject *object):
+	m_object(object)
+{}
+
 // Creates an ObjectRef and leaves it on top of stack
 // Not callable from Lua; all references are created on the C side.
 void ObjectRef::create(lua_State *L, ServerActiveObject *object)
 {
-	ObjectRef *o = new ObjectRef(object);
-	//infostream<<"ObjectRef::create: o="<<o<<std::endl;
-	*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+	ObjectRef *obj = new ObjectRef(object);
+	*(void **)(lua_newuserdata(L, sizeof(void *))) = obj;
 	luaL_getmetatable(L, className);
 	lua_setmetatable(L, -2);
 }
 
 void ObjectRef::set_null(lua_State *L)
 {
-	ObjectRef *o = checkobject(L, -1);
-	o->m_object = NULL;
+	ObjectRef *obj = checkobject(L, -1);
+	obj->m_object = nullptr;
 }
 
 void ObjectRef::Register(lua_State *L)
@@ -2245,12 +2282,8 @@ void ObjectRef::Register(lua_State *L)
 
 	lua_pop(L, 1);  // drop metatable
 
-	markAliasDeprecated(methods);
 	luaL_openlib(L, 0, methods, 0);  // fill methodtable
 	lua_pop(L, 1);  // drop methodtable
-
-	// Cannot be created from Lua
-	//lua_register(L, className, create_object);
 }
 
 const char ObjectRef::className[] = "ObjectRef";
@@ -2278,15 +2311,19 @@ luaL_Reg ObjectRef::methods[] = {
 	luamethod(ObjectRef, get_bone_position),
 	luamethod(ObjectRef, set_attach),
 	luamethod(ObjectRef, get_attach),
+	luamethod(ObjectRef, get_children),
 	luamethod(ObjectRef, set_detach),
 	luamethod(ObjectRef, set_properties),
 	luamethod(ObjectRef, get_properties),
 	luamethod(ObjectRef, set_nametag_attributes),
 	luamethod(ObjectRef, get_nametag_attributes),
-	// LuaEntitySAO-only
+
 	luamethod_aliased(ObjectRef, set_velocity, setvelocity),
-	luamethod(ObjectRef, add_velocity),
+	luamethod_aliased(ObjectRef, add_velocity, add_player_velocity),
 	luamethod_aliased(ObjectRef, get_velocity, getvelocity),
+	luamethod_dep(ObjectRef, get_velocity, get_player_velocity),
+
+	// LuaEntitySAO-only
 	luamethod_aliased(ObjectRef, set_acceleration, setacceleration),
 	luamethod_aliased(ObjectRef, get_acceleration, getacceleration),
 	luamethod_aliased(ObjectRef, set_yaw, setyaw),
@@ -2294,15 +2331,14 @@ luaL_Reg ObjectRef::methods[] = {
 	luamethod(ObjectRef, set_rotation),
 	luamethod(ObjectRef, get_rotation),
 	luamethod_aliased(ObjectRef, set_texture_mod, settexturemod),
+	luamethod(ObjectRef, get_texture_mod),
 	luamethod_aliased(ObjectRef, set_sprite, setsprite),
 	luamethod(ObjectRef, get_entity_name),
 	luamethod(ObjectRef, get_luaentity),
+
 	// Player-only
 	luamethod(ObjectRef, is_player),
-	luamethod(ObjectRef, is_player_connected),
 	luamethod(ObjectRef, get_player_name),
-	luamethod(ObjectRef, get_player_velocity),
-	luamethod(ObjectRef, add_player_velocity),
 	luamethod(ObjectRef, get_look_dir),
 	luamethod(ObjectRef, get_look_pitch),
 	luamethod(ObjectRef, get_look_yaw),
@@ -2357,5 +2393,6 @@ luaL_Reg ObjectRef::methods[] = {
 	luamethod(ObjectRef, set_eye_offset),
 	luamethod(ObjectRef, get_eye_offset),
 	luamethod(ObjectRef, send_mapblock),
+	luamethod(ObjectRef, set_minimap_modes),
 	{0,0}
 };