oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Server class code cleanups (#9769)

Browse source 
* Server::overrideDayNightRatio doesn't require to return bool
There is no sense to sending null player, the caller should send a valid object

* Server::init: make private & cleanup
This function is always called before start() and loads some variables which can be loaded in constructor directly.
Make it private and call it directly in start

* Split Server inventory responsibility to a dedicated object

This splits permit to found various historical issues:
* duplicate lookups on player connection
* sending inventory to non related player when a player connects
* non friendly lookups on detached inventories ownership

This reduce the detached inventory complexity and also increased the
lookup performance in a quite interesting way for servers with thousands
of inventories.
This commit is contained in:
Loïc Blot 2020-05-07 22:38:41 +02:00 • committed by GitHub
parent 650168cada
commit 454dbf83a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 312 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/script/lua_api/l_object.cpp
View file

@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "scripting_server.h"
#include "server/luaentity_sao.h"
#include "server/player_sao.h"
#include "server/serverinventorymgr.h"
/*
ObjectRef
@ -289,7 +290,7 @@ int ObjectRef::l_get_inventory(lua_State *L)
if (co == NULL) return 0;
// Do it
InventoryLocation loc = co->getInventoryLocation();
if (getServer(L)->getInventory(loc) != NULL)
if (getServerInventoryMgr(L)->getInventory(loc) != NULL)
InvRef::create(L, loc);
else
lua_pushnil(L); // An object may have no inventory (nil)
@ -2172,9 +2173,7 @@ int ObjectRef::l_override_day_night_ratio(lua_State *L)
ratio = readParam<float>(L, 2);
}
if (!getServer(L)->overrideDayNightRatio(player, do_override, ratio))
return 0;
getServer(L)->overrideDayNightRatio(player, do_override, ratio);
lua_pushboolean(L, true);
return 1;
}