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

Fix EventService.Call not implemented correctly

Browse Source
This commit is contained in:
Evil Factory
2026-02-03 21:06:13 -03:00
committed by Maplewheels
parent 4cf4b1604b
commit cf251451ed
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/EventService.cs
View File

@@ -5,6 +5,7 @@ using FluentResults;
using FluentResults.LuaCs;
using HarmonyLib;
using Microsoft.Toolkit.Diagnostics;
using MoonSharp.Interpreter;
using OneOf;
using RestSharp;
using System;
@@ -132,6 +133,11 @@ public partial class EventService : IEventService
}
public object Call(string eventName, params object[] args)
{
return Call<object>(eventName, args);
}
public T Call<T>(string eventName, params object[] args)
{
Guard.IsNotNullOrWhiteSpace(eventName, nameof(eventName));
using var lck = _operationsLock.AcquireReaderLock().ConfigureAwait(false).GetAwaiter().GetResult();
@@ -140,16 +146,36 @@ public partial class EventService : IEventService
if (!_luaLegacyEventsSubscribers.TryGetValue(eventName, out var eventSubscribers)
|| eventSubscribers.IsEmpty)
{
return null;
return default;
}
object returnValue = null;
T returnValue = default;
foreach (var subscriber in eventSubscribers)
{
try
{
returnValue = subscriber.Value.Invoke(args);
object result = subscriber.Value.Invoke(args);
if (result is DynValue luaResult)
{
if (luaResult.Type == DataType.Tuple)
{
bool replaceNil = luaResult.Tuple.Length > 1 && luaResult.Tuple[1].CastToBool();
if (!luaResult.Tuple[0].IsNil() || replaceNil)
{
returnValue = luaResult.ToObject<T>();
}
}
else if (!luaResult.IsNil())
{
returnValue = luaResult.ToObject<T>();
}
}
else
{
returnValue = (T)result;
}
}
catch (Exception e)
{
@@ -163,11 +189,6 @@ public partial class EventService : IEventService
return returnValue;
}
public T Call<T>(string eventName, params object[] args)
{
return (T)Call(eventName, args);
}
public void Subscribe<T>(string identifier, IDictionary<string, LuaCsFunc> callbacks) where T : IEvent<T>
{
Guard.IsNotNullOrWhiteSpace(identifier, nameof(identifier));