vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clientList.job hook

Browse Source
This commit is contained in:
Evil Factory
2022-01-19 19:42:54 -03:00
parent 33ca66fcae
commit 0a47c85a72
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
+6 -5
View File
@@ -1812,7 +1812,8 @@ namespace Barotrauma.Networking
outmsg.Write(client.SteamID); outmsg.Write(client.SteamID);
outmsg.Write(client.NameID); outmsg.Write(client.NameID);
outmsg.Write(client.Name); outmsg.Write(client.Name);
outmsg.Write(client.Character?.Info?.Job != null && gameStarted ? client.Character.Info.Job.Prefab.Identifier : (client.PreferredJob ?? "")); var result1 = new LuaResult(GameMain.Lua.hook.Call("clientList.job", c, client));
outmsg.Write(result1.IsNull() ? (client.Character?.Info?.Job != null && gameStarted ? client.Character.Info.Job.Prefab.Identifier : (client.PreferredJob ?? "")) : result1.String());
outmsg.Write((byte)client.PreferredTeam); outmsg.Write((byte)client.PreferredTeam);
outmsg.Write(client.Character == null || !gameStarted ? (ushort)0 : client.Character.ID); outmsg.Write(client.Character == null || !gameStarted ? (ushort)0 : client.Character.ID);
if (c.HasPermission(ClientPermissions.ServerLog)) if (c.HasPermission(ClientPermissions.ServerLog))
@@ -1825,10 +1826,10 @@ namespace Barotrauma.Networking
} }
outmsg.Write(client.Muted); outmsg.Write(client.Muted);
outmsg.Write(client.InGame); outmsg.Write(client.InGame);
var result = new LuaResult(GameMain.Lua.hook.Call("clientList.hasPermission", c, client)); var result2 = new LuaResult(GameMain.Lua.hook.Call("clientList.hasPermission", c, client));
outmsg.Write(result.IsNull() ? client.Permissions != ClientPermissions.None : result.Bool()); outmsg.Write(result2.IsNull() ? client.Permissions != ClientPermissions.None : result2.Bool());
var result2 = new LuaResult(GameMain.Lua.hook.Call("clientList.hasCrown", c, client)); var result3 = new LuaResult(GameMain.Lua.hook.Call("clientList.hasCrown", c, client));
outmsg.Write(result2.IsNull() ? client.Connection == OwnerConnection : result2.Bool()); outmsg.Write(result3.IsNull() ? client.Connection == OwnerConnection : result3.Bool());
outmsg.Write(client.Connection != OwnerConnection && outmsg.Write(client.Connection != OwnerConnection &&
!client.HasPermission(ClientPermissions.Ban) && !client.HasPermission(ClientPermissions.Ban) &&
!client.HasPermission(ClientPermissions.Kick) && !client.HasPermission(ClientPermissions.Kick) &&
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses.cs
+14 -2
View File
@@ -1062,7 +1062,7 @@ namespace Barotrauma
{ {
var num = dynValue.CastToNumber(); var num = dynValue.CastToNumber();
if (num == null) { return 0f; } if (num == null) { return 0f; }
return (float)num; return (float)num.Value;
} }
return 0f; return 0f;
@@ -1074,12 +1074,24 @@ namespace Barotrauma
{ {
var num = dynValue.CastToNumber(); var num = dynValue.CastToNumber();
if (num == null) { return 0f; } if (num == null) { return 0f; }
return (double)num; return num.Value;
} }
return 0f; return 0f;
} }
public string String()
{
if (result is DynValue dynValue)
{
var str = dynValue.CastToString();
if (str == null) { return ""; }
return str;
}
return "";
}
public object Object() public object Object()
{ {
if(result is DynValue dynValue) if(result is DynValue dynValue)