]> git.lizzy.rs Git - minetest.git/blobdiff - src/script/lua_api/l_object.cpp
Fix visual slide issue with set_detach, fixes #5620
[minetest.git] / src / script / lua_api / l_object.cpp
index f90b59285bdde7de38a9c71888cb70f472b83c5f..a5b6e3941f58e68df011dd0c4b7e2df9051ee1bf 100644 (file)
@@ -17,21 +17,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "cpp_api/scriptapi.h"
-#include "common/c_converter.h"
-#include "common/c_content.h"
 #include "lua_api/l_object.h"
-#include "common/c_internal.h"
+#include "lua_api/l_internal.h"
 #include "lua_api/l_inventory.h"
 #include "lua_api/l_item.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
 #include "log.h"
 #include "tool.h"
 #include "serverobject.h"
-#include "content_object.h"
 #include "content_sao.h"
 #include "server.h"
 #include "hud.h"
-
+#include "scripting_server.h"
 
 struct EnumString es_HudElementType[] =
 {
@@ -39,12 +37,14 @@ struct EnumString es_HudElementType[] =
        {HUD_ELEM_TEXT,      "text"},
        {HUD_ELEM_STATBAR,   "statbar"},
        {HUD_ELEM_INVENTORY, "inventory"},
+       {HUD_ELEM_WAYPOINT,  "waypoint"},
 {0, NULL},
 };
 
 struct EnumString es_HudElementStat[] =
 {
-       {HUD_STAT_POS,    "pos"},
+       {HUD_STAT_POS,    "position"},
+       {HUD_STAT_POS,    "pos"}, /* Deprecated, only for compatibility's sake */
        {HUD_STAT_NAME,   "name"},
        {HUD_STAT_SCALE,  "scale"},
        {HUD_STAT_TEXT,   "text"},
@@ -53,6 +53,7 @@ struct EnumString es_HudElementStat[] =
        {HUD_STAT_DIR,    "direction"},
        {HUD_STAT_ALIGN,  "alignment"},
        {HUD_STAT_OFFSET, "offset"},
+       {HUD_STAT_WORLD_POS, "world_pos"},
        {0, NULL},
 };
 
@@ -63,6 +64,7 @@ struct EnumString es_HudBuiltinElement[] =
        {HUD_FLAG_CROSSHAIR_VISIBLE, "crosshair"},
        {HUD_FLAG_WIELDITEM_VISIBLE, "wielditem"},
        {HUD_FLAG_BREATHBAR_VISIBLE, "breathbar"},
+       {HUD_FLAG_MINIMAP_VISIBLE,   "minimap"},
        {0, NULL},
 };
 
@@ -75,7 +77,7 @@ 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) luaL_typerror(L, narg, className);
        return *(ObjectRef**)ud;  // unbox pointer
 }
 
@@ -88,9 +90,9 @@ ServerActiveObject* ObjectRef::getobject(ObjectRef *ref)
 LuaEntitySAO* ObjectRef::getluaobject(ObjectRef *ref)
 {
        ServerActiveObject *obj = getobject(ref);
-       if(obj == NULL)
+       if (obj == NULL)
                return NULL;
-       if(obj->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
+       if (obj->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
                return NULL;
        return (LuaEntitySAO*)obj;
 }
@@ -98,17 +100,17 @@ LuaEntitySAO* ObjectRef::getluaobject(ObjectRef *ref)
 PlayerSAO* ObjectRef::getplayersao(ObjectRef *ref)
 {
        ServerActiveObject *obj = getobject(ref);
-       if(obj == NULL)
+       if (obj == NULL)
                return NULL;
-       if(obj->getType() != ACTIVEOBJECT_TYPE_PLAYER)
+       if (obj->getType() != ACTIVEOBJECT_TYPE_PLAYER)
                return NULL;
        return (PlayerSAO*)obj;
 }
 
-Player* ObjectRef::getplayer(ObjectRef *ref)
+RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 {
        PlayerSAO *playersao = getplayersao(ref);
-       if(playersao == NULL)
+       if (playersao == NULL)
                return NULL;
        return playersao->getPlayer();
 }
@@ -126,23 +128,36 @@ int ObjectRef::gc_object(lua_State *L) {
 // remove(self)
 int ObjectRef::l_remove(lua_State *L)
 {
-       NO_MAP_LOCK_REQUIRED;
+       GET_ENV_PTR;
+
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL)
+               return 0;
+       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+               return 0;
+
+       const UNORDERED_SET<int> &child_ids = co->getAttachmentChildIds();
+       UNORDERED_SET<int>::const_iterator it;
+       for (it = child_ids.begin(); it != child_ids.end(); ++it) {
+               // Child can be NULL if it was deleted earlier
+               if (ServerActiveObject *child = env->getActiveObject(*it))
+                       child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
+       }
+
        verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
        co->m_removed = true;
        return 0;
 }
 
-// getpos(self)
+// get_pos(self)
 // returns: {x=num, y=num, z=num}
-int ObjectRef::l_getpos(lua_State *L)
+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;
+       if (co == NULL) return 0;
        v3f pos = co->getBasePosition() / BS;
        lua_newtable(L);
        lua_pushnumber(L, pos.X);
@@ -154,14 +169,14 @@ int ObjectRef::l_getpos(lua_State *L)
        return 1;
 }
 
-// setpos(self, pos)
-int ObjectRef::l_setpos(lua_State *L)
+// set_pos(self, pos)
+int ObjectRef::l_set_pos(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        //LuaEntitySAO *co = getluaobject(ref);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        // pos
        v3f pos = checkFloatPos(L, 2);
        // Do it
@@ -169,14 +184,14 @@ int ObjectRef::l_setpos(lua_State *L)
        return 0;
 }
 
-// moveto(self, pos, continuous=false)
-int ObjectRef::l_moveto(lua_State *L)
+// move_to(self, pos, continuous=false)
+int ObjectRef::l_move_to(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        //LuaEntitySAO *co = getluaobject(ref);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        // pos
        v3f pos = checkFloatPos(L, 2);
        // continuous
@@ -194,20 +209,36 @@ int ObjectRef::l_punch(lua_State *L)
        ObjectRef *puncher_ref = checkobject(L, 2);
        ServerActiveObject *co = getobject(ref);
        ServerActiveObject *puncher = getobject(puncher_ref);
-       if(co == NULL) return 0;
-       if(puncher == NULL) return 0;
+       if (co == NULL) return 0;
+       if (puncher == NULL) return 0;
        v3f dir;
-       if(lua_type(L, 5) != LUA_TTABLE)
+       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))
+       if (lua_isnumber(L, 3))
                time_from_last_punch = lua_tonumber(L, 3);
        ToolCapabilities toolcap = read_tool_capabilities(L, 4);
        dir.normalize();
+
+       s16 src_original_hp = co->getHP();
+       s16 dst_origin_hp = puncher->getHP();
+
        // Do it
        co->punch(dir, &toolcap, puncher, time_from_last_punch);
+
+       // 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 the puncher is a player, and its HP changed
+       if (dst_origin_hp != puncher->getHP() &&
+                       puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)puncher);
+       }
        return 0;
 }
 
@@ -219,8 +250,8 @@ int ObjectRef::l_right_click(lua_State *L)
        ObjectRef *ref2 = checkobject(L, 2);
        ServerActiveObject *co = getobject(ref);
        ServerActiveObject *co2 = getobject(ref2);
-       if(co == NULL) return 0;
-       if(co2 == NULL) return 0;
+       if (co == NULL) return 0;
+       if (co2 == NULL) return 0;
        // Do it
        co->rightClick(co2);
        return 0;
@@ -235,12 +266,15 @@ int ObjectRef::l_set_hp(lua_State *L)
        ObjectRef *ref = checkobject(L, 1);
        luaL_checknumber(L, 2);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        int hp = lua_tonumber(L, 2);
        /*infostream<<"ObjectRef::l_set_hp(): id="<<co->getId()
                        <<" hp="<<hp<<std::endl;*/
        // Do it
        co->setHP(hp);
+       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co);
+
        // Return
        return 0;
 }
@@ -253,7 +287,7 @@ int ObjectRef::l_get_hp(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL){
+       if (co == NULL) {
                // Default hp is 1
                lua_pushnumber(L, 1);
                return 1;
@@ -272,10 +306,10 @@ 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;
+       if (co == NULL) return 0;
        // Do it
        InventoryLocation loc = co->getInventoryLocation();
-       if(STACK_TO_SERVER(L)->getInventory(loc) != NULL)
+       if (getServer(L)->getInventory(loc) != NULL)
                InvRef::create(L, loc);
        else
                lua_pushnil(L); // An object may have no inventory (nil)
@@ -288,7 +322,7 @@ int ObjectRef::l_get_wield_list(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        // Do it
        lua_pushstring(L, co->getWieldList().c_str());
        return 1;
@@ -300,7 +334,7 @@ int ObjectRef::l_get_wield_index(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        // Do it
        lua_pushinteger(L, co->getWieldIndex() + 1);
        return 1;
@@ -312,7 +346,7 @@ int ObjectRef::l_get_wielded_item(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL){
+       if (co == NULL) {
                // Empty ItemStack
                LuaItemStack::create(L, ItemStack());
                return 1;
@@ -328,10 +362,13 @@ 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;
+       if (co == NULL) return 0;
        // Do it
-       ItemStack item = read_item(L, 2,STACK_TO_SERVER(L));
+       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));
+       }
        lua_pushboolean(L, success);
        return 1;
 }
@@ -342,7 +379,7 @@ 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;
+       if (co == NULL) return 0;
        // Do it
        ItemGroupList groups;
        read_groups(L, 2, groups);
@@ -350,103 +387,354 @@ int ObjectRef::l_set_armor_groups(lua_State *L)
        return 0;
 }
 
-// set_physics_override(self, physics_override_speed, physics_override_jump, physics_override_gravity)
+// get_armor_groups(self)
+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)
+               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;
+       if (co == NULL) return 0;
        // Do it
-       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);
+       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;
 }
 
-// set_animation(self, frame_range, frame_speed, frame_blend)
+// 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");
+       return 1;
+}
+
+// set_animation(self, frame_range, frame_speed, frame_blend, frame_loop)
 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;
+       if (co == NULL) return 0;
        // Do it
        v2f frames = v2f(1, 1);
-       if(!lua_isnil(L, 2))
+       if (!lua_isnil(L, 2))
                frames = read_v2f(L, 2);
        float frame_speed = 15;
-       if(!lua_isnil(L, 3))
+       if (!lua_isnil(L, 3))
                frame_speed = lua_tonumber(L, 3);
        float frame_blend = 0;
-       if(!lua_isnil(L, 4))
+       if (!lua_isnil(L, 4))
                frame_blend = lua_tonumber(L, 4);
-       co->setAnimation(frames, frame_speed, frame_blend);
+       bool frame_loop = true;
+       if (lua_isboolean(L, 5))
+               frame_loop = lua_toboolean(L, 5);
+       co->setAnimation(frames, frame_speed, frame_blend, frame_loop);
        return 0;
 }
 
+// get_animation(self)
+int ObjectRef::l_get_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);
+       float frame_speed = 15;
+       float frame_blend = 0;
+       bool frame_loop = true;
+       co->getAnimation(&frames, &frame_speed, &frame_blend, &frame_loop);
+
+       push_v2f(L, frames);
+       lua_pushnumber(L, frame_speed);
+       lua_pushnumber(L, frame_blend);
+       lua_pushboolean(L, frame_loop);
+       return 4;
+}
+
+// set_local_animation(self, {stand/idle}, {walk}, {dig}, {walk+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)
+               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);
+
+       if (!getServer(L)->setLocalPlayerAnimations(player, frames, frame_speed))
+               return 0;
+
+       lua_pushboolean(L, true);
+       return 0;
+}
+
+// get_local_animation(self)
+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)
+               return 0;
+
+       v2s32 frames[4];
+       float frame_speed;
+       player->getLocalAnimations(frames, &frame_speed);
+
+       for (int i = 0; i < 4; i++) {
+               push_v2s32(L, frames[i]);
+       }
+
+       lua_pushnumber(L, frame_speed);
+       return 5;
+}
+
+// set_eye_offset(self, v3f first pv, v3f third pv)
+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)
+               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);
+
+       // 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) */
+       offset_third.Y = rangelim(offset_third.Y,-10,15); //1.5*BS
+
+       if (!getServer(L)->setPlayerEyeOffset(player, offset_first, offset_third))
+               return 0;
+
+       lua_pushboolean(L, true);
+       return 0;
+}
+
+// get_eye_offset(self)
+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)
+               return 0;
+       // Do it
+       push_v3f(L, player->eye_offset_first);
+       push_v3f(L, player->eye_offset_third);
+       return 2;
+}
+
 // set_bone_position(self, std::string bone, v3f position, v3f 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;
+       if (co == NULL) return 0;
        // Do it
        std::string bone = "";
-       if(!lua_isnil(L, 2))
+       if (!lua_isnil(L, 2))
                bone = lua_tostring(L, 2);
        v3f position = v3f(0, 0, 0);
-       if(!lua_isnil(L, 3))
-               position = read_v3f(L, 3);
+       if (!lua_isnil(L, 3))
+               position = check_v3f(L, 3);
        v3f rotation = v3f(0, 0, 0);
-       if(!lua_isnil(L, 4))
-               rotation = read_v3f(L, 4);
+       if (!lua_isnil(L, 4))
+               rotation = check_v3f(L, 4);
        co->setBonePosition(bone, position, rotation);
        return 0;
 }
 
+// get_bone_position(self, bone)
+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)
+               return 0;
+       // Do it
+       std::string bone = "";
+       if (!lua_isnil(L, 2))
+               bone = lua_tostring(L, 2);
+
+       v3f position = v3f(0, 0, 0);
+       v3f rotation = v3f(0, 0, 0);
+       co->getBonePosition(bone, &position, &rotation);
+
+       push_v3f(L, position);
+       push_v3f(L, rotation);
+       return 2;
+}
+
 // set_attach(self, parent, bone, position, rotation)
 int ObjectRef::l_set_attach(lua_State *L)
 {
-       NO_MAP_LOCK_REQUIRED;
+       GET_ENV_PTR;
+
        ObjectRef *ref = checkobject(L, 1);
        ObjectRef *parent_ref = checkobject(L, 2);
        ServerActiveObject *co = getobject(ref);
        ServerActiveObject *parent = getobject(parent_ref);
-       if(co == NULL) return 0;
-       if(parent == NULL) return 0;
+       if (co == NULL)
+               return 0;
+       if (parent == NULL)
+               return 0;
        // Do it
+       int parent_id = 0;
        std::string bone = "";
-       if(!lua_isnil(L, 3))
-               bone = lua_tostring(L, 3);
        v3f position = v3f(0, 0, 0);
-       if(!lua_isnil(L, 4))
-               position = read_v3f(L, 4);
        v3f rotation = v3f(0, 0, 0);
-       if(!lua_isnil(L, 5))
+       co->getAttachment(&parent_id, &bone, &position, &rotation);
+       if (parent_id) {
+               ServerActiveObject *old_parent = env->getActiveObject(parent_id);
+               old_parent->removeAttachmentChild(co->getId());
+       }
+
+       bone = "";
+       if (!lua_isnil(L, 3))
+               bone = lua_tostring(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());
        return 0;
 }
 
+// get_attach(self)
+int ObjectRef::l_get_attach(lua_State *L)
+{
+       GET_ENV_PTR;
+
+       ObjectRef *ref = checkobject(L, 1);
+       ServerActiveObject *co = getobject(ref);
+       if (co == NULL)
+               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)
+               return 0;
+       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;
+}
+
 // set_detach(self)
 int ObjectRef::l_set_detach(lua_State *L)
 {
-       NO_MAP_LOCK_REQUIRED;
+       GET_ENV_PTR;
+
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL)
+               return 0;
+
+       int parent_id = 0;
+       std::string bone = "";
+       v3f position;
+       v3f rotation;
+       co->getAttachment(&parent_id, &bone, &position, &rotation);
+       ServerActiveObject *parent = NULL;
+       if (parent_id) {
+               parent = env->getActiveObject(parent_id);
+               co->setAttachment(0, "", position, rotation);
+       } else {
+               co->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
+       }
        // Do it
-       co->setAttachment(0, "", v3f(0,0,0), v3f(0,0,0));
+       if (parent != NULL)
+               parent->removeAttachmentChild(co->getId());
        return 0;
 }
 
@@ -456,50 +744,127 @@ int ObjectRef::l_set_properties(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        ObjectProperties *prop = co->accessObjectProperties();
-       if(!prop)
+       if (!prop)
                return 0;
-       read_object_properties(L, 2, prop);
+       read_object_properties(L, 2, prop, getServer(L)->idef());
        co->notifyObjectPropertiesModified();
        return 0;
 }
 
+// get_properties(self)
+int ObjectRef::l_get_properties(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       ServerActiveObject *co = getobject(ref);
+       if (co == NULL)
+               return 0;
+       ObjectProperties *prop = co->accessObjectProperties();
+       if (!prop)
+               return 0;
+       push_object_properties(L, prop);
+       return 1;
+}
+
+// is_player(self)
+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));
+       return 1;
+}
+
+// set_nametag_attributes(self, attributes)
+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)
+               return 0;
+       ObjectProperties *prop = co->accessObjectProperties();
+       if (!prop)
+               return 0;
+
+       lua_getfield(L, 2, "color");
+       if (!lua_isnil(L, -1)) {
+               video::SColor color = prop->nametag_color;
+               read_color(L, -1, &color);
+               prop->nametag_color = color;
+       }
+       lua_pop(L, 1);
+
+       std::string nametag = getstringfield_default(L, 2, "text", "");
+       prop->nametag = nametag;
+
+       co->notifyObjectPropertiesModified();
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_nametag_attributes(self)
+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)
+               return 0;
+       ObjectProperties *prop = co->accessObjectProperties();
+       if (!prop)
+               return 0;
+
+       video::SColor color = prop->nametag_color;
+
+       lua_newtable(L);
+       push_ARGB8(L, color);
+       lua_setfield(L, -2, "color");
+       lua_pushstring(L, prop->nametag.c_str());
+       lua_setfield(L, -2, "text");
+       return 1;
+}
+
 /* LuaEntitySAO-only */
 
-// setvelocity(self, {x=num, y=num, z=num})
-int ObjectRef::l_setvelocity(lua_State *L)
+// set_velocity(self, {x=num, y=num, z=num})
+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;
+       if (co == NULL) return 0;
        v3f pos = checkFloatPos(L, 2);
        // Do it
        co->setVelocity(pos);
        return 0;
 }
 
-// getvelocity(self)
-int ObjectRef::l_getvelocity(lua_State *L)
+// get_velocity(self)
+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;
+       if (co == NULL) return 0;
        // Do it
        v3f v = co->getVelocity();
        pushFloatPos(L, v);
        return 1;
 }
 
-// setacceleration(self, {x=num, y=num, z=num})
-int ObjectRef::l_setacceleration(lua_State *L)
+// set_acceleration(self, {x=num, y=num, z=num})
+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;
+       if (co == NULL) return 0;
        // pos
        v3f pos = checkFloatPos(L, 2);
        // Do it
@@ -507,78 +872,91 @@ int ObjectRef::l_setacceleration(lua_State *L)
        return 0;
 }
 
-// getacceleration(self)
-int ObjectRef::l_getacceleration(lua_State *L)
+// get_acceleration(self)
+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;
+       if (co == NULL) return 0;
        // Do it
        v3f v = co->getAcceleration();
        pushFloatPos(L, v);
        return 1;
 }
 
-// setyaw(self, radians)
-int ObjectRef::l_setyaw(lua_State *L)
+// set_yaw(self, radians)
+int ObjectRef::l_set_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        LuaEntitySAO *co = getluaobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
        // Do it
        co->setYaw(yaw);
        return 0;
 }
 
-// getyaw(self)
-int ObjectRef::l_getyaw(lua_State *L)
+// get_yaw(self)
+int ObjectRef::l_get_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        LuaEntitySAO *co = getluaobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        // Do it
        float yaw = co->getYaw() * core::DEGTORAD;
        lua_pushnumber(L, yaw);
        return 1;
 }
 
-// settexturemod(self, mod)
-int ObjectRef::l_settexturemod(lua_State *L)
+// set_texture_mod(self, mod)
+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;
+       if (co == NULL) return 0;
        // Do it
        std::string mod = luaL_checkstring(L, 2);
        co->setTextureMod(mod);
        return 0;
 }
 
-// setsprite(self, p={x=0,y=0}, num_frames=1, framelength=0.2,
+// get_texture_mod(self)
+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();
+       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)
-int ObjectRef::l_setsprite(lua_State *L)
+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;
+       if (co == NULL) return 0;
        // Do it
        v2s16 p(0,0);
-       if(!lua_isnil(L, 2))
+       if (!lua_isnil(L, 2))
                p = read_v2s16(L, 2);
        int num_frames = 1;
-       if(!lua_isnil(L, 3))
+       if (!lua_isnil(L, 3))
                num_frames = lua_tonumber(L, 3);
        float framelength = 0.2;
-       if(!lua_isnil(L, 4))
+       if (!lua_isnil(L, 4))
                framelength = lua_tonumber(L, 4);
        bool select_horiz_by_yawpitch = false;
-       if(!lua_isnil(L, 5))
+       if (!lua_isnil(L, 5))
                select_horiz_by_yawpitch = lua_toboolean(L, 5);
        co->setSprite(p, num_frames, framelength, select_horiz_by_yawpitch);
        return 0;
@@ -591,7 +969,8 @@ int ObjectRef::l_get_entity_name(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        LuaEntitySAO *co = getluaobject(ref);
-       if(co == NULL) return 0;
+       log_deprecated(L,"Deprecated call to \"get_entity_name");
+       if (co == NULL) return 0;
        // Do it
        std::string name = co->getName();
        lua_pushstring(L, name.c_str());
@@ -604,7 +983,7 @@ 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;
+       if (co == NULL) return 0;
        // Do it
        luaentity_get(L, co->getId());
        return 1;
@@ -612,13 +991,13 @@ int ObjectRef::l_get_luaentity(lua_State *L)
 
 /* Player-only */
 
-// is_player(self)
-int ObjectRef::l_is_player(lua_State *L)
+// is_player_connected(self)
+int ObjectRef::l_is_player_connected(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       lua_pushboolean(L, (player != NULL));
+       RemotePlayer *player = getplayer(ref);
+       lua_pushboolean(L, (player != NULL && player->peer_id != 0));
        return 1;
 }
 
@@ -627,8 +1006,8 @@ int ObjectRef::l_get_player_name(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL){
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
        }
@@ -637,82 +1016,232 @@ int ObjectRef::l_get_player_name(lua_State *L)
        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);
+       return 1;
+}
+
 // get_look_dir(self)
 int ObjectRef::l_get_look_dir(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) return 0;
        // Do it
-       float pitch = player->getRadPitch();
-       float yaw = player->getRadYaw();
+       float pitch = co->getRadPitchDep();
+       float yaw = co->getRadYawDep();
        v3f v(cos(pitch)*cos(yaw), sin(pitch), cos(pitch)*sin(yaw));
        push_v3f(L, v);
        return 1;
 }
 
+// DEPRECATED
 // get_look_pitch(self)
 int ObjectRef::l_get_look_pitch(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       log_deprecated(L,
+               "Deprecated call to get_look_pitch, use get_look_vertical instead");
+
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) return 0;
        // Do it
-       lua_pushnumber(L, player->getRadPitch());
+       lua_pushnumber(L, co->getRadPitchDep());
        return 1;
 }
 
+// DEPRECATED
 // get_look_yaw(self)
 int ObjectRef::l_get_look_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       log_deprecated(L,
+               "Deprecated call to get_look_yaw, use get_look_horizontal instead");
+
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) return 0;
+       // Do it
+       lua_pushnumber(L, co->getRadYawDep());
+       return 1;
+}
+
+// get_look_pitch2(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->getRadPitch());
+       return 1;
+}
+
+// get_look_yaw2(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, player->getRadYaw());
+       lua_pushnumber(L, co->getRadYaw());
        return 1;
 }
 
+// set_look_vertical(self, radians)
+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;
+       float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
+       // Do it
+       co->setPitchAndSend(pitch);
+       return 1;
+}
+
+// set_look_horizontal(self, radians)
+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;
+       float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
+       // Do it
+       co->setYawAndSend(yaw);
+       return 1;
+}
+
+// DEPRECATED
 // set_look_pitch(self, radians)
 int ObjectRef::l_set_look_pitch(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       log_deprecated(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;
+       if (co == NULL) return 0;
        float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
        // Do it
-       co->setPitch(pitch);
+       co->setPitchAndSend(pitch);
        return 1;
 }
 
+// DEPRECATED
 // set_look_yaw(self, radians)
 int ObjectRef::l_set_look_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       log_deprecated(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;
+       if (co == NULL) return 0;
        float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
        // Do it
-       co->setYaw(yaw);
+       co->setYawAndSend(yaw);
        return 1;
 }
 
+// set_breath(self, breath)
+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;
+       u16 breath = luaL_checknumber(L, 2);
+       co->setBreath(breath);
+
+       return 0;
+}
+
+// get_breath(self)
+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);
+       return 1;
+}
+
+// set_attribute(self, attribute, value)
+int ObjectRef::l_set_attribute(lua_State *L)
+{
+       ObjectRef *ref = checkobject(L, 1);
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) {
+               return 0;
+       }
+
+       std::string attr = luaL_checkstring(L, 2);
+       std::string value = luaL_checkstring(L, 3);
+
+       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+               co->setExtendedAttribute(attr, value);
+       }
+       return 1;
+}
+
+// get_attribute(self, attribute)
+int ObjectRef::l_get_attribute(lua_State *L)
+{
+       ObjectRef *ref = checkobject(L, 1);
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) {
+               return 0;
+       }
+
+       std::string attr = luaL_checkstring(L, 2);
+
+       std::string value = "";
+       if (co->getExtendedAttribute(attr, &value)) {
+               lua_pushstring(L, value.c_str());
+               return 1;
+       }
+
+       return 0;
+}
+
+
 // set_inventory_formspec(self, formspec)
 int ObjectRef::l_set_inventory_formspec(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) return 0;
        std::string formspec = luaL_checkstring(L, 2);
 
        player->inventory_formspec = formspec;
-       STACK_TO_SERVER(L)->reportInventoryFormspecModified(player->getName());
+       getServer(L)->reportInventoryFormspecModified(player->getName());
        lua_pushboolean(L, true);
        return 1;
 }
@@ -722,8 +1251,8 @@ int ObjectRef::l_get_inventory_formspec(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) return 0;
 
        std::string formspec = player->inventory_formspec;
        lua_pushlstring(L, formspec.c_str(), formspec.size());
@@ -735,13 +1264,13 @@ int ObjectRef::l_get_player_control(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL){
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
        }
-       // Do it
-       PlayerControl control = player->getPlayerControl();
+
+       const PlayerControl &control = player->getPlayerControl();
        lua_newtable(L);
        lua_pushboolean(L, control.up);
        lua_setfield(L, -2, "up");
@@ -769,8 +1298,8 @@ int ObjectRef::l_get_player_control_bits(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL){
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
        }
@@ -782,8 +1311,9 @@ int ObjectRef::l_get_player_control_bits(lua_State *L)
 // hud_add(self, form)
 int ObjectRef::l_hud_add(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -800,11 +1330,19 @@ int ObjectRef::l_hud_add(lua_State *L)
        elem->scale = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
        lua_pop(L, 1);
 
+       lua_getfield(L, 2, "size");
+       elem->size = lua_istable(L, -1) ? read_v2s32(L, -1) : v2s32();
+       lua_pop(L, 1);
+
        elem->name   = getstringfield_default(L, 2, "name", "");
        elem->text   = getstringfield_default(L, 2, "text", "");
        elem->number = getintfield_default(L, 2, "number", 0);
        elem->item   = getintfield_default(L, 2, "item", 0);
-       elem->dir    = getintfield_default(L, 2, "dir", 0);
+       elem->dir    = getintfield_default(L, 2, "direction", 0);
+
+       // Deprecated, only for compatibility's sake
+       if (elem->dir == 0)
+               elem->dir = getintfield_default(L, 2, "dir", 0);
 
        lua_getfield(L, 2, "alignment");
        elem->align = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
@@ -814,8 +1352,17 @@ int ObjectRef::l_hud_add(lua_State *L)
        elem->offset = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
        lua_pop(L, 1);
 
-       u32 id = STACK_TO_SERVER(L)->hudAdd(player, elem);
-       if (id == (u32)-1) {
+       lua_getfield(L, 2, "world_pos");
+       elem->world_pos = lua_istable(L, -1) ? read_v3f(L, -1) : v3f();
+       lua_pop(L, 1);
+
+       /* check for known deprecated element usage */
+       if ((elem->type  == HUD_ELEM_STATBAR) && (elem->size == v2s32())) {
+               log_deprecated(L,"Deprecated usage of statbar without size!");
+       }
+
+       u32 id = getServer(L)->hudAdd(player, elem);
+       if (id == U32_MAX) {
                delete elem;
                return 0;
        }
@@ -827,8 +1374,9 @@ int ObjectRef::l_hud_add(lua_State *L)
 // hud_remove(self, id)
 int ObjectRef::l_hud_remove(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -836,7 +1384,7 @@ int ObjectRef::l_hud_remove(lua_State *L)
        if (!lua_isnil(L, 2))
                id = lua_tonumber(L, 2);
 
-       if (!STACK_TO_SERVER(L)->hudRemove(player, id))
+       if (!getServer(L)->hudRemove(player, id))
                return 0;
 
        lua_pushboolean(L, true);
@@ -846,33 +1394,34 @@ int ObjectRef::l_hud_remove(lua_State *L)
 // hud_change(self, id, stat, data)
 int ObjectRef::l_hud_change(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
-       u32 id = -1;
-       if (!lua_isnil(L, 2))
-               id = lua_tonumber(L, 2);
+       u32 id = lua_isnumber(L, 2) ? lua_tonumber(L, 2) : -1;
 
-       HudElementStat stat = (HudElementStat)getenumfield(L, 3, "stat",
-                                                               es_HudElementStat, HUD_STAT_NUMBER);
-
-       if (id >= player->hud.size())
-               return 0;
-
-       void *value = NULL;
-       HudElement *e = player->hud[id];
+       HudElement *e = player->getHud(id);
        if (!e)
                return 0;
 
+       HudElementStat stat = HUD_STAT_NUMBER;
+       if (lua_isstring(L, 3)) {
+               int statint;
+               std::string statstr = lua_tostring(L, 3);
+               stat = string_to_enum(es_HudElementStat, statint, statstr) ?
+                               (HudElementStat)statint : HUD_STAT_NUMBER;
+       }
+
+       void *value = NULL;
        switch (stat) {
                case HUD_STAT_POS:
                        e->pos = read_v2f(L, 4);
                        value = &e->pos;
                        break;
                case HUD_STAT_NAME:
-                       e->name = lua_tostring(L, 4);
+                       e->name = luaL_checkstring(L, 4);
                        value = &e->name;
                        break;
                case HUD_STAT_SCALE:
@@ -880,29 +1429,40 @@ int ObjectRef::l_hud_change(lua_State *L)
                        value = &e->scale;
                        break;
                case HUD_STAT_TEXT:
-                       e->text = lua_tostring(L, 4);
+                       e->text = luaL_checkstring(L, 4);
                        value = &e->text;
                        break;
                case HUD_STAT_NUMBER:
-                       e->number = lua_tonumber(L, 4);
+                       e->number = luaL_checknumber(L, 4);
                        value = &e->number;
                        break;
                case HUD_STAT_ITEM:
-                       e->item = lua_tonumber(L, 4);
+                       e->item = luaL_checknumber(L, 4);
                        value = &e->item;
                        break;
                case HUD_STAT_DIR:
-                       e->dir = lua_tonumber(L, 4);
+                       e->dir = luaL_checknumber(L, 4);
                        value = &e->dir;
+                       break;
                case HUD_STAT_ALIGN:
                        e->align = read_v2f(L, 4);
                        value = &e->align;
+                       break;
                case HUD_STAT_OFFSET:
                        e->offset = read_v2f(L, 4);
                        value = &e->offset;
+                       break;
+               case HUD_STAT_WORLD_POS:
+                       e->world_pos = read_v3f(L, 4);
+                       value = &e->world_pos;
+                       break;
+               case HUD_STAT_SIZE:
+                       e->size = read_v2s32(L, 4);
+                       value = &e->size;
+                       break;
        }
 
-       STACK_TO_SERVER(L)->hudChange(player, id, stat, value);
+       getServer(L)->hudChange(player, id, stat, value);
 
        lua_pushboolean(L, true);
        return 1;
@@ -911,16 +1471,15 @@ int ObjectRef::l_hud_change(lua_State *L)
 // hud_get(self, id)
 int ObjectRef::l_hud_get(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
        u32 id = lua_tonumber(L, -1);
-       if (id >= player->hud.size())
-               return 0;
 
-       HudElement *e = player->hud[id];
+       HudElement *e = player->getHud(id);
        if (!e)
                return 0;
 
@@ -947,24 +1506,32 @@ int ObjectRef::l_hud_get(lua_State *L)
        lua_pushnumber(L, e->item);
        lua_setfield(L, -2, "item");
 
+       lua_pushnumber(L, e->dir);
+       lua_setfield(L, -2, "direction");
+
+       // Deprecated, only for compatibility's sake
        lua_pushnumber(L, e->dir);
        lua_setfield(L, -2, "dir");
 
+       push_v3f(L, e->world_pos);
+       lua_setfield(L, -2, "world_pos");
+
        return 1;
 }
 
 // hud_set_flags(self, flags)
 int ObjectRef::l_hud_set_flags(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
        u32 flags = 0;
        u32 mask  = 0;
        bool flag;
-       
+
        const EnumString *esp = es_HudBuiltinElement;
        for (int i = 0; esp[i].str; i++) {
                if (getboolfield(L, 2, esp[i].str, flag)) {
@@ -972,30 +1539,240 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
                        mask  |= esp[i].num;
                }
        }
-       if (!STACK_TO_SERVER(L)->hudSetFlags(player, flags, mask))
+       if (!getServer(L)->hudSetFlags(player, flags, mask))
                return 0;
 
        lua_pushboolean(L, true);
        return 1;
 }
 
+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)
+               return 0;
+
+       lua_newtable(L);
+       lua_pushboolean(L, player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE);
+       lua_setfield(L, -2, "hotbar");
+       lua_pushboolean(L, player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE);
+       lua_setfield(L, -2, "healthbar");
+       lua_pushboolean(L, player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE);
+       lua_setfield(L, -2, "crosshair");
+       lua_pushboolean(L, player->hud_flags & HUD_FLAG_WIELDITEM_VISIBLE);
+       lua_setfield(L, -2, "wielditem");
+       lua_pushboolean(L, player->hud_flags & HUD_FLAG_BREATHBAR_VISIBLE);
+       lua_setfield(L, -2, "breathbar");
+       lua_pushboolean(L, player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE);
+       lua_setfield(L, -2, "minimap");
+
+       return 1;
+}
+
 // hud_set_hotbar_itemcount(self, hotbar_itemcount)
 int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
        s32 hotbar_itemcount = lua_tonumber(L, 2);
 
-       if (!STACK_TO_SERVER(L)->hudSetHotbarItemcount(player, hotbar_itemcount))
+       if (!getServer(L)->hudSetHotbarItemcount(player, hotbar_itemcount))
+               return 0;
+
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// hud_get_hotbar_itemcount(self)
+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)
+               return 0;
+
+       s32 hotbar_itemcount = getServer(L)->hudGetHotbarItemcount(player);
+
+       lua_pushnumber(L, hotbar_itemcount);
+       return 1;
+}
+
+// hud_set_hotbar_image(self, name)
+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)
+               return 0;
+
+       std::string name = lua_tostring(L, 2);
+
+       getServer(L)->hudSetHotbarImage(player, name);
+       return 1;
+}
+
+// hud_get_hotbar_image(self)
+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)
+               return 0;
+
+       std::string name = getServer(L)->hudGetHotbarImage(player);
+       lua_pushlstring(L, name.c_str(), name.size());
+       return 1;
+}
+
+// hud_set_hotbar_selected_image(self, name)
+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)
+               return 0;
+
+       std::string name = lua_tostring(L, 2);
+
+       getServer(L)->hudSetHotbarSelectedImage(player, name);
+       return 1;
+}
+
+// hud_get_hotbar_selected_image(self)
+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)
+               return 0;
+
+       const std::string &name = getServer(L)->hudGetHotbarSelectedImage(player);
+       lua_pushlstring(L, name.c_str(), name.size());
+       return 1;
+}
+
+// set_sky(self, bgcolor, type, list)
+int ObjectRef::l_set_sky(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
+               return 0;
+
+       video::SColor bgcolor(255,255,255,255);
+       read_color(L, 2, &bgcolor);
+
+       std::string type = luaL_checkstring(L, 3);
+
+       std::vector<std::string> params;
+       if (lua_istable(L, 4)) {
+               int table = lua_gettop(L);
+               lua_pushnil(L);
+               while (lua_next(L, table) != 0) {
+                       // key at index -2 and value at index -1
+                       if (lua_isstring(L, -1))
+                               params.push_back(lua_tostring(L, -1));
+                       else
+                               params.push_back("");
+                       // removes value, keeps key for next iteration
+                       lua_pop(L, 1);
+               }
+       }
+
+       if (type == "skybox" && params.size() != 6)
+               throw LuaError("skybox expects 6 textures");
+
+       if (!getServer(L)->setSky(player, bgcolor, type, params))
+               return 0;
+
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_sky(self)
+int ObjectRef::l_get_sky(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
+               return 0;
+       video::SColor bgcolor(255, 255, 255, 255);
+       std::string type;
+       std::vector<std::string> params;
+
+       player->getSky(&bgcolor, &type, &params);
+       type = type == "" ? "regular" : type;
+
+       push_ARGB8(L, bgcolor);
+       lua_pushlstring(L, type.c_str(), type.size());
+       lua_newtable(L);
+       s16 i = 1;
+       for (std::vector<std::string>::iterator it = params.begin();
+                       it != params.end(); ++it) {
+               lua_pushlstring(L, it->c_str(), it->size());
+               lua_rawseti(L, -2, i);
+               i++;
+       }
+       return 3;
+}
+
+// override_day_night_ratio(self, brightness=0...1)
+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)
+               return 0;
+
+       bool do_override = false;
+       float ratio = 0.0f;
+       if (!lua_isnil(L, 2)) {
+               do_override = true;
+               ratio = luaL_checknumber(L, 2);
+       }
+
+       if (!getServer(L)->overrideDayNightRatio(player, do_override, ratio))
                return 0;
 
        lua_pushboolean(L, true);
        return 1;
 }
 
+// get_day_night_ratio(self)
+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)
+               return 0;
+
+       bool do_override;
+       float ratio;
+       player->getDayNightRatio(&do_override, &ratio);
+
+       if (do_override)
+               lua_pushnumber(L, ratio);
+       else
+               lua_pushnil(L);
+
+       return 1;
+}
+
 ObjectRef::ObjectRef(ServerActiveObject *object):
        m_object(object)
 {
@@ -1004,7 +1781,7 @@ ObjectRef::ObjectRef(ServerActiveObject *object):
 
 ObjectRef::~ObjectRef()
 {
-       /*if(m_object)
+       /*if (m_object)
                infostream<<"ObjectRef destructing for id="
                                <<m_object->getId()<<std::endl;
        else
@@ -1057,12 +1834,12 @@ void ObjectRef::Register(lua_State *L)
 }
 
 const char ObjectRef::className[] = "ObjectRef";
-const luaL_reg ObjectRef::methods[] = {
+const luaL_Reg ObjectRef::methods[] = {
        // ServerActiveObject
        luamethod(ObjectRef, remove),
-       luamethod(ObjectRef, getpos),
-       luamethod(ObjectRef, setpos),
-       luamethod(ObjectRef, moveto),
+       luamethod_aliased(ObjectRef, get_pos, getpos),
+       luamethod_aliased(ObjectRef, set_pos, setpos),
+       luamethod_aliased(ObjectRef, move_to, moveto),
        luamethod(ObjectRef, punch),
        luamethod(ObjectRef, right_click),
        luamethod(ObjectRef, set_hp),
@@ -1073,42 +1850,72 @@ const luaL_reg ObjectRef::methods[] = {
        luamethod(ObjectRef, get_wielded_item),
        luamethod(ObjectRef, set_wielded_item),
        luamethod(ObjectRef, set_armor_groups),
-       luamethod(ObjectRef, set_physics_override),
+       luamethod(ObjectRef, get_armor_groups),
        luamethod(ObjectRef, set_animation),
+       luamethod(ObjectRef, get_animation),
        luamethod(ObjectRef, set_bone_position),
+       luamethod(ObjectRef, get_bone_position),
        luamethod(ObjectRef, set_attach),
+       luamethod(ObjectRef, get_attach),
        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(ObjectRef, setvelocity),
-       luamethod(ObjectRef, getvelocity),
-       luamethod(ObjectRef, setacceleration),
-       luamethod(ObjectRef, getacceleration),
-       luamethod(ObjectRef, setyaw),
-       luamethod(ObjectRef, getyaw),
-       luamethod(ObjectRef, settexturemod),
-       luamethod(ObjectRef, setsprite),
+       luamethod_aliased(ObjectRef, set_velocity, setvelocity),
+       luamethod_aliased(ObjectRef, get_velocity, getvelocity),
+       luamethod_aliased(ObjectRef, set_acceleration, setacceleration),
+       luamethod_aliased(ObjectRef, get_acceleration, getacceleration),
+       luamethod_aliased(ObjectRef, set_yaw, setyaw),
+       luamethod_aliased(ObjectRef, get_yaw, getyaw),
+       luamethod_aliased(ObjectRef, set_texture_mod, settexturemod),
+       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, get_look_dir),
        luamethod(ObjectRef, get_look_pitch),
        luamethod(ObjectRef, get_look_yaw),
+       luamethod(ObjectRef, get_look_vertical),
+       luamethod(ObjectRef, get_look_horizontal),
+       luamethod(ObjectRef, set_look_horizontal),
+       luamethod(ObjectRef, set_look_vertical),
        luamethod(ObjectRef, set_look_yaw),
        luamethod(ObjectRef, set_look_pitch),
+       luamethod(ObjectRef, get_breath),
+       luamethod(ObjectRef, set_breath),
+       luamethod(ObjectRef, get_attribute),
+       luamethod(ObjectRef, set_attribute),
        luamethod(ObjectRef, set_inventory_formspec),
        luamethod(ObjectRef, get_inventory_formspec),
        luamethod(ObjectRef, get_player_control),
        luamethod(ObjectRef, get_player_control_bits),
+       luamethod(ObjectRef, set_physics_override),
+       luamethod(ObjectRef, get_physics_override),
        luamethod(ObjectRef, hud_add),
        luamethod(ObjectRef, hud_remove),
        luamethod(ObjectRef, hud_change),
        luamethod(ObjectRef, hud_get),
        luamethod(ObjectRef, hud_set_flags),
+       luamethod(ObjectRef, hud_get_flags),
        luamethod(ObjectRef, hud_set_hotbar_itemcount),
+       luamethod(ObjectRef, hud_get_hotbar_itemcount),
+       luamethod(ObjectRef, hud_set_hotbar_image),
+       luamethod(ObjectRef, hud_get_hotbar_image),
+       luamethod(ObjectRef, hud_set_hotbar_selected_image),
+       luamethod(ObjectRef, hud_get_hotbar_selected_image),
+       luamethod(ObjectRef, set_sky),
+       luamethod(ObjectRef, get_sky),
+       luamethod(ObjectRef, override_day_night_ratio),
+       luamethod(ObjectRef, get_day_night_ratio),
+       luamethod(ObjectRef, set_local_animation),
+       luamethod(ObjectRef, get_local_animation),
+       luamethod(ObjectRef, set_eye_offset),
+       luamethod(ObjectRef, get_eye_offset),
        {0,0}
 };
-
-REGISTER_LUA_REF(ObjectRef)