aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api/l_object.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/script/lua_api/l_object.cpp')
-rw-r--r--src/script/lua_api/l_object.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 6bd07a4c1..dc65def23 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -730,8 +730,7 @@ int ObjectRef::l_set_nametag_attributes(lua_State *L)
}
lua_pop(L, 1);
- std::string nametag = getstringfield_default(L, 2, "text", "");
- prop->nametag = nametag;
+ prop->nametag = getstringfield_default(L, 2, "text", prop->nametag);
prop->validate();
sao->notifyObjectPropertiesModified();
@@ -1366,7 +1365,7 @@ int ObjectRef::l_get_player_control(lua_State *L)
lua_newtable(L);
if (player == nullptr)
return 1;
-
+
const PlayerControl &control = player->getPlayerControl();
lua_pushboolean(L, control.direction_keys & (1 << 0));
lua_setfield(L, -2, "up");
@@ -2082,11 +2081,10 @@ int ObjectRef::l_set_stars(lua_State *L)
star_params.scale = getfloatfield_default(L, 2,
"scale", star_params.scale);
+ star_params.day_opacity = getfloatfield_default(L, 2,
+ "day_opacity", star_params.day_opacity);
}
- star_params.day_opacity = getfloatfield_default(L, 2,
- "day_opacity", star_params.day_opacity);
-
getServer(L)->setStars(player, star_params);
return 0;
}