From 1f6de3da628aafa020bc3e21da0efc60a3be1a2f Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 13 Nov 2017 01:44:37 -0500 Subject: [PATCH] Fixes bridge dll reflection --- TGS.Server/Instance/DreamDaemon.cs | 2 +- TGS.Server/Instance/Interop.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TGS.Server/Instance/DreamDaemon.cs b/TGS.Server/Instance/DreamDaemon.cs index 6983e2b585..a6846ab2ac 100644 --- a/TGS.Server/Instance/DreamDaemon.cs +++ b/TGS.Server/Instance/DreamDaemon.cs @@ -542,7 +542,7 @@ namespace TGS.Server try { //Use reflection to ensure these are the droids we're looking for - Assembly.ReflectionOnlyLoadFrom(BridgePath).GetType(DreamDaemonBridgeType, true); + Assembly.ReflectionOnlyLoadFrom(BridgePath).GetType(String.Format("{0}.{1}.{2}.{3}", nameof(TGS), nameof(Interface), DreamDaemonBridgeNamespace, DreamDaemonBridgeType), true); } catch (Exception e) { diff --git a/TGS.Server/Instance/Interop.cs b/TGS.Server/Instance/Interop.cs index 9365ba04fd..9bae1cecf6 100644 --- a/TGS.Server/Instance/Interop.cs +++ b/TGS.Server/Instance/Interop.cs @@ -56,11 +56,11 @@ namespace TGS.Server /// /// The namespace that contains the bridge class. Used for reflection /// - const string DreamDaemonBridgeNamespace = "TGDreamDaemonBridge"; + const string DreamDaemonBridgeNamespace = "Bridge"; /// /// The bridge class. Used for reflection /// - const string DreamDaemonBridgeType = DreamDaemonBridgeNamespace + ".DreamDaemonBridge"; + const string DreamDaemonBridgeType = "DreamDaemonBridge"; List ServerChatCommands;