Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	Moose Development/Moose/Wrapper/Client.lua
This commit is contained in:
Applevangelist
2023-11-08 11:25:34 +01:00
2 changed files with 20 additions and 18 deletions

View File

@@ -585,7 +585,7 @@ function CLIENT:GetUCID()
return net.get_player_info(tonumber(PID), 'ucid')
end
--- [Multi-Player Server] Return a table of attributes for a given CLIENT. If optional attribute is present, only that value is returned.
--- [Multi-Player Server] Return a table of attributes from CLIENT. If optional attribute is present, only that value is returned.
-- @param #CLIENT self
-- @param #string Attribute (Optional) The attribute to obtain. List see below.
-- @return #table PlayerInfo or nil if it cannot be found