From 0d83db45260baa345b4f9245bae912b8b77cbe2d Mon Sep 17 00:00:00 2001 From: Brad Kramer Date: Mon, 10 Apr 2017 08:22:20 -0400 Subject: [PATCH] Bugfix - Client requested GMCP not being pushed to clients Outstanding bug - Networkserver.cs in proxymud - Clients not registering HasGMCPModule --- CPHelper/CPHelper.csproj | 2 +- CommandEcho/CommandEcho.csproj | 2 +- GMCPEcho/GMCPEcho.csproj | 2 +- GQPredict/GQPredict.csproj | 2 +- Mapper/Mapper.csproj | 2 +- MobDB/MobDB.csproj | 2 +- MoonScript/MoonScript.csproj | 2 +- MudLog/MudLog.csproj | 2 +- MySQL/MySQL.csproj | 2 +- ProxyMud.sln | 1 + ProxyMud/Network/NetworkServer.cs | 7 ++++--- StayAlive/StayAlive.csproj | 2 +- 12 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CPHelper/CPHelper.csproj b/CPHelper/CPHelper.csproj index a5c3c6b..9870097 100644 --- a/CPHelper/CPHelper.csproj +++ b/CPHelper/CPHelper.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/CommandEcho/CommandEcho.csproj b/CommandEcho/CommandEcho.csproj index 20b01f3..b83b585 100644 --- a/CommandEcho/CommandEcho.csproj +++ b/CommandEcho/CommandEcho.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/GMCPEcho/GMCPEcho.csproj b/GMCPEcho/GMCPEcho.csproj index cbc3173..6264966 100644 --- a/GMCPEcho/GMCPEcho.csproj +++ b/GMCPEcho/GMCPEcho.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/GQPredict/GQPredict.csproj b/GQPredict/GQPredict.csproj index c27449e..ab66997 100644 --- a/GQPredict/GQPredict.csproj +++ b/GQPredict/GQPredict.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/Mapper/Mapper.csproj b/Mapper/Mapper.csproj index d7aaeb2..b62a4ec 100644 --- a/Mapper/Mapper.csproj +++ b/Mapper/Mapper.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/MobDB/MobDB.csproj b/MobDB/MobDB.csproj index 992d9bc..1d8d679 100644 --- a/MobDB/MobDB.csproj +++ b/MobDB/MobDB.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/MoonScript/MoonScript.csproj b/MoonScript/MoonScript.csproj index 179a7cb..4849c0f 100644 --- a/MoonScript/MoonScript.csproj +++ b/MoonScript/MoonScript.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/MudLog/MudLog.csproj b/MudLog/MudLog.csproj index 349f644..b3d23f9 100644 --- a/MudLog/MudLog.csproj +++ b/MudLog/MudLog.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/MySQL/MySQL.csproj b/MySQL/MySQL.csproj index 2e7e185..c7ceb36 100644 --- a/MySQL/MySQL.csproj +++ b/MySQL/MySQL.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4 diff --git a/ProxyMud.sln b/ProxyMud.sln index 153d3fb..66ac424 100644 --- a/ProxyMud.sln +++ b/ProxyMud.sln @@ -13,6 +13,7 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandEcho", "CommandEcho\CommandEcho.csproj", "{A51883B5-8A7B-414F-92A9-A171A9846411}" ProjectSection(ProjectDependencies) = postProject {7863FE6F-E27F-4DBA-B2CC-EDEFE4AE8382} = {7863FE6F-E27F-4DBA-B2CC-EDEFE4AE8382} + {B5F8F4E3-630A-420D-8461-420C36BB865C} = {B5F8F4E3-630A-420D-8461-420C36BB865C} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPHelper", "CPHelper\CPHelper.csproj", "{11D11063-A123-4F02-9C20-FB76C49A4B52}" diff --git a/ProxyMud/Network/NetworkServer.cs b/ProxyMud/Network/NetworkServer.cs index dae01ff..2df49c1 100644 --- a/ProxyMud/Network/NetworkServer.cs +++ b/ProxyMud/Network/NetworkServer.cs @@ -220,8 +220,9 @@ namespace ProxyMud.Network //The problem is between here and next comment -- or at least this is what controls the GMCP shit that gets sent to the client. if((m.Flags & MessageFlags.GMCP) != MessageFlags.None) { - if(!Clients[i].HasGMCPModule(m.Msg.ToLower())) - continue; +//the following line is the problem... looks like my client isnt registering "hasGMCPModule" + // if(!Clients[i].HasGMCPModule(m.Msg.ToLower())) + // continue; if(m.MsgData == null || m.MsgData.Length == 0) continue; @@ -243,7 +244,7 @@ namespace ProxyMud.Network byte[] data = Encoding.Default.GetBytes(msg + m.LineEnding); strMessage.Write(data, 0, data.Length); } -//BLAH +//BLAH*/ } if(strMessage.Length == 0) diff --git a/StayAlive/StayAlive.csproj b/StayAlive/StayAlive.csproj index 5be8661..7958637 100644 --- a/StayAlive/StayAlive.csproj +++ b/StayAlive/StayAlive.csproj @@ -37,7 +37,7 @@ true full false - ..\..\..\..\Desktop\MushProxy-Build\Plugins\ + ..\..\..\..\Desktop\MushProxy-Build\ DEBUG;TRACE prompt 4