This commit is contained in:
Mister_Nebula 2021-03-18 16:57:56 +00:00
parent eeafa16c01
commit 7709da7cd6
3 changed files with 10 additions and 4 deletions

View File

@ -5,7 +5,6 @@ using QSB.Player;
using QSB.QuantumSync.WorldObjects; using QSB.QuantumSync.WorldObjects;
using QSB.Utility; using QSB.Utility;
using QSB.WorldSync; using QSB.WorldSync;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;

View File

@ -2,7 +2,7 @@
namespace QSB.QuantumSync.WorldObjects namespace QSB.QuantumSync.WorldObjects
{ {
class QSBQuantumState : WorldObject<QuantumState> internal class QSBQuantumState : WorldObject<QuantumState>
{ {
public bool IsMeantToBeEnabled; public bool IsMeantToBeEnabled;

View File

@ -42,7 +42,14 @@ namespace QSB.WorldSync
public static TWorldObject GetWorldFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject) public static TWorldObject GetWorldFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject)
where TWorldObject : WorldObject<TUnityObject> where TWorldObject : WorldObject<TUnityObject>
where TUnityObject : MonoBehaviour where TUnityObject : MonoBehaviour
=> WorldObjectsToUnityObjects[unityObject] as TWorldObject; {
if (!WorldObjectsToUnityObjects.ContainsKey(unityObject))
{
DebugLog.DebugWrite($"Error - WorldObjectsToUnityObjects does not contain \"{unityObject.name}\"!", MessageType.Error);
return default;
}
return WorldObjectsToUnityObjects[unityObject] as TWorldObject;
}
public static int GetIdFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject) public static int GetIdFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject)
where TWorldObject : WorldObject<TUnityObject> where TWorldObject : WorldObject<TUnityObject>
@ -71,7 +78,7 @@ namespace QSB.WorldSync
} }
catch (Exception e) catch (Exception e)
{ {
DebugLog.ToConsole($"Error - Exception in OnRemoval() for {item.GetType()}. Message : {e.Message}, Stack trace : {e.StackTrace}", MessageType.Error); DebugLog.ToConsole($"Error - Exception in OnRemoval() for {item.GetType()}. Message : {e.InnerException.Message}, Stack trace : {e.InnerException.StackTrace}", MessageType.Error);
} }
} }
DebugLog.DebugWrite($"Removing {typeof(TWorldObject).Name} : {WorldObjects.Count(x => x is TWorldObject)} instances."); DebugLog.DebugWrite($"Removing {typeof(TWorldObject).Name} : {WorldObjects.Count(x => x is TWorldObject)} instances.");