fix launch code event + add check for duplicate eventtypes

This commit is contained in:
Mister_Nebula 2021-11-20 17:38:00 +00:00
parent 8a27aefb44
commit 0c78faff03
5 changed files with 29 additions and 3 deletions

View File

@ -8,6 +8,7 @@
DebugEvent,
SatelliteProjector,
SatelliteProjectorSnapshot,
LaunchCodes,
/*
* SERVER EVENTS

View File

@ -2,6 +2,8 @@
{
public interface IQSBEvent
{
EventType Type { get; }
void SetupListener();
void CloseListener();
}

View File

@ -75,7 +75,7 @@ namespace QSB.Events
if (PlayerTransformSync.LocalInstance == null || PlayerTransformSync.LocalInstance.GetComponent<QNetworkIdentity>() == null)
{
DebugLog.ToConsole($"Warning - Tried to handle message of type <{message.GetType().Name}> before localplayer was established.", MessageType.Warning);
DebugLog.ToConsole($"Warning - Tried to handle message of type <{GetType().Name}> before localplayer was established.", MessageType.Warning);
return;
}
@ -92,7 +92,7 @@ namespace QSB.Events
}
catch (Exception ex)
{
DebugLog.ToConsole($"Error - Exception handling message {message.GetType().Name} : {ex}", MessageType.Error);
DebugLog.ToConsole($"Error - Exception handling message {GetType().Name} : {ex}", MessageType.Error);
}
}
}

View File

@ -32,6 +32,9 @@ using QSB.Utility.Events;
using System.Collections.Generic;
using QSB.MeteorSync.Events;
using QSB.RespawnSync.Events;
using System.Linq;
using HarmonyLib;
using System.Text;
namespace QSB.Events
{
@ -130,6 +133,26 @@ namespace QSB.Events
_eventList.ForEach(ev => ev.SetupListener());
var duplicates = _eventList
.GroupBy(qsbEvent => qsbEvent.Type)
.Where(group => group.Count() > 1);
if (duplicates.Count() != 0)
{
var totalSb = new StringBuilder();
foreach (var group in duplicates)
{
totalSb.Append($"{group.Key}\r\n");
foreach (var qsbEvent in group)
{
totalSb.Append($"- {qsbEvent.GetType().Name}\r\n");
}
}
DebugLog.DebugWrite($"Error - These QSBEvents handle the same EventType!\r\n{totalSb}", MessageType.Error);
return;
}
Ready = true;
DebugLog.DebugWrite("Event Manager ready.", MessageType.Success);

View File

@ -6,7 +6,7 @@ namespace QSB.Player.Events
{
public class PlayerInformationEvent : QSBEvent<PlayerInformationMessage>
{
public override EventType Type => EventType.PlayerInformation;
public override EventType Type => EventType.LaunchCodes;
public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerInformation, Handler);
public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerInformation, Handler);