From 363644c26e4b64a9f70184f9d44b0cf4360f9bea Mon Sep 17 00:00:00 2001 From: emawind84 Date: Sun, 29 Mar 2015 15:20:08 +0900 Subject: [PATCH 1/3] removed a check in ScanGrids that prevented the use of options like ownedby:userid --- EssentialsPlugin/EssentialsPlugin.csproj | 45 ++++++++++++++++-------- EssentialsPlugin/Utility/CubeGrid.cs | 22 ++++++------ 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/EssentialsPlugin/EssentialsPlugin.csproj b/EssentialsPlugin/EssentialsPlugin.csproj index 647113e..0fa695a 100644 --- a/EssentialsPlugin/EssentialsPlugin.csproj +++ b/EssentialsPlugin/EssentialsPlugin.csproj @@ -204,27 +204,26 @@ False - ..\..\SEServerExtender\GameLibraries\Sandbox.Common.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\Sandbox.Common.dll False - ..\..\SEServerExtender\GameLibraries\Sandbox.Common.XmlSerializers.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\Sandbox.Common.XmlSerializers.dll False - ..\..\SEServerExtender\GameLibraries\Sandbox.Game.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\Sandbox.Game.dll - - False - ..\..\SEServerExtender\SEServerExtender\bin\x64\Release\SEModAPI.dll + + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\SEModAPI.dll False - ..\..\SEServerExtender\SEServerExtender\bin\x64\Release\SEModAPIExtensions.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\SEModAPIExtensions.dll False - ..\..\SEServerExtender\SEServerExtender\bin\x64\Release\SEModAPIInternal.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\SEModAPIInternal.dll @@ -234,14 +233,32 @@ False - ..\..\SEServerExtender\GameLibraries\VRage.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.dll + + + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Audio.dll + + + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Common.dll + + + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Data.dll + + + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Input.dll - ..\..\SEServerExtender\GameLibraries\VRage.Library.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Library.dll False - ..\..\SEServerExtender\GameLibraries\VRage.Math.dll + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Math.dll + + + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Native.dll + + + ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Render.dll @@ -263,10 +280,8 @@ - copy "$(TargetPath)" "C:\ProgramData\SpaceEngineersDedicated\survival test\Mods\Essentials\" -set textTemplatingPath="%25CommonProgramFiles(x86)%25\Microsoft Shared\TextTemplating\$(VisualStudioVersion)\texttransform.exe" -if %25textTemplatingPath%25=="\Microsoft Shared\TextTemplating\$(VisualStudioVersion)\texttransform.exe" set textTemplatingPath="%25CommonProgramFiles%25\Microsoft Shared\TextTemplating\$(VisualStudioVersion)\texttransform.exe" -%25textTemplatingPath%25 "$(ProjectDir)AssemblyFileVersion.tt" + + diff --git a/EssentialsPlugin/Utility/CubeGrid.cs b/EssentialsPlugin/Utility/CubeGrid.cs index 542c533..67bb1d3 100644 --- a/EssentialsPlugin/Utility/CubeGrid.cs +++ b/EssentialsPlugin/Utility/CubeGrid.cs @@ -628,17 +628,17 @@ public static HashSet ScanGrids( ulong userId, string line ) return new HashSet( ); } - if ( words.Length - 3 > options.Count ) - { - if ( ApplicationLog.BaseLog.IsDebugEnabled ) - { - ApplicationLog.BaseLog.Debug( "Essentials: Arguments: {0}", string.Join( " ", words ) ); - ApplicationLog.BaseLog.Debug( "Essentials: Options: {0}", string.Join( ",", options.Keys ) ); - } - Communication.SendPrivateInformation( userId, "Possible problem with your parameters (options provided is larger than options found). Not returning any results in case of error" ); - - return new HashSet( ); - } + //if ( words.Length - 3 > options.Count ) + //{ + if (ApplicationLog.BaseLog.IsDebugEnabled) + { + ApplicationLog.BaseLog.Debug("Essentials: Arguments: {0}", string.Join(" ", words)); + ApplicationLog.BaseLog.Debug("Essentials: Options: {0}", string.Join(",", options.Keys)); + } + // Communication.SendPrivateInformation( userId, "Possible problem with your parameters (options provided is larger than options found). Not returning any results in case of error" ); + + // return new HashSet( ); + //} if ( !scanOptions.Quiet ) Communication.SendPrivateInformation( userId, string.Format( "Scanning for ships with options: {0}", GetOptionsText( options ) ) ); From f383d1328f59ea579b5701ffa15b55839be12291 Mon Sep 17 00:00:00 2001 From: emawind84 Date: Sun, 29 Mar 2015 15:21:02 +0900 Subject: [PATCH 2/3] Revert "removed a check in ScanGrids that prevented the use of options like ownedby:userid" This reverts commit 363644c26e4b64a9f70184f9d44b0cf4360f9bea. --- EssentialsPlugin/EssentialsPlugin.csproj | 45 ++++++++---------------- EssentialsPlugin/Utility/CubeGrid.cs | 22 ++++++------ 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/EssentialsPlugin/EssentialsPlugin.csproj b/EssentialsPlugin/EssentialsPlugin.csproj index 0fa695a..647113e 100644 --- a/EssentialsPlugin/EssentialsPlugin.csproj +++ b/EssentialsPlugin/EssentialsPlugin.csproj @@ -204,26 +204,27 @@ False - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\Sandbox.Common.dll + ..\..\SEServerExtender\GameLibraries\Sandbox.Common.dll False - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\Sandbox.Common.XmlSerializers.dll + ..\..\SEServerExtender\GameLibraries\Sandbox.Common.XmlSerializers.dll False - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\Sandbox.Game.dll + ..\..\SEServerExtender\GameLibraries\Sandbox.Game.dll - - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\SEModAPI.dll + + False + ..\..\SEServerExtender\SEServerExtender\bin\x64\Release\SEModAPI.dll False - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\SEModAPIExtensions.dll + ..\..\SEServerExtender\SEServerExtender\bin\x64\Release\SEModAPIExtensions.dll False - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\SEModAPIInternal.dll + ..\..\SEServerExtender\SEServerExtender\bin\x64\Release\SEModAPIInternal.dll @@ -233,32 +234,14 @@ False - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.dll - - - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Audio.dll - - - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Common.dll - - - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Data.dll - - - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Input.dll + ..\..\SEServerExtender\GameLibraries\VRage.dll - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Library.dll + ..\..\SEServerExtender\GameLibraries\VRage.Library.dll False - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Math.dll - - - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Native.dll - - - ..\..\..\..\OneDrive\Documenti\GitHub\EssentialsPlugin\GameLibraries\VRage.Render.dll + ..\..\SEServerExtender\GameLibraries\VRage.Math.dll @@ -280,8 +263,10 @@ - - + copy "$(TargetPath)" "C:\ProgramData\SpaceEngineersDedicated\survival test\Mods\Essentials\" +set textTemplatingPath="%25CommonProgramFiles(x86)%25\Microsoft Shared\TextTemplating\$(VisualStudioVersion)\texttransform.exe" +if %25textTemplatingPath%25=="\Microsoft Shared\TextTemplating\$(VisualStudioVersion)\texttransform.exe" set textTemplatingPath="%25CommonProgramFiles%25\Microsoft Shared\TextTemplating\$(VisualStudioVersion)\texttransform.exe" +%25textTemplatingPath%25 "$(ProjectDir)AssemblyFileVersion.tt" diff --git a/EssentialsPlugin/Utility/CubeGrid.cs b/EssentialsPlugin/Utility/CubeGrid.cs index 67bb1d3..542c533 100644 --- a/EssentialsPlugin/Utility/CubeGrid.cs +++ b/EssentialsPlugin/Utility/CubeGrid.cs @@ -628,17 +628,17 @@ public static HashSet ScanGrids( ulong userId, string line ) return new HashSet( ); } - //if ( words.Length - 3 > options.Count ) - //{ - if (ApplicationLog.BaseLog.IsDebugEnabled) - { - ApplicationLog.BaseLog.Debug("Essentials: Arguments: {0}", string.Join(" ", words)); - ApplicationLog.BaseLog.Debug("Essentials: Options: {0}", string.Join(",", options.Keys)); - } - // Communication.SendPrivateInformation( userId, "Possible problem with your parameters (options provided is larger than options found). Not returning any results in case of error" ); - - // return new HashSet( ); - //} + if ( words.Length - 3 > options.Count ) + { + if ( ApplicationLog.BaseLog.IsDebugEnabled ) + { + ApplicationLog.BaseLog.Debug( "Essentials: Arguments: {0}", string.Join( " ", words ) ); + ApplicationLog.BaseLog.Debug( "Essentials: Options: {0}", string.Join( ",", options.Keys ) ); + } + Communication.SendPrivateInformation( userId, "Possible problem with your parameters (options provided is larger than options found). Not returning any results in case of error" ); + + return new HashSet( ); + } if ( !scanOptions.Quiet ) Communication.SendPrivateInformation( userId, string.Format( "Scanning for ships with options: {0}", GetOptionsText( options ) ) ); From 3be6adcf62bc35ac082bb58411eba074d60193a0 Mon Sep 17 00:00:00 2001 From: emawind84 Date: Sun, 29 Mar 2015 15:24:03 +0900 Subject: [PATCH 3/3] Fix for scan function that prevented the use of options like ownedby:userid --- EssentialsPlugin/Utility/CubeGrid.cs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/EssentialsPlugin/Utility/CubeGrid.cs b/EssentialsPlugin/Utility/CubeGrid.cs index 542c533..e8d5ab5 100644 --- a/EssentialsPlugin/Utility/CubeGrid.cs +++ b/EssentialsPlugin/Utility/CubeGrid.cs @@ -628,18 +628,12 @@ public static HashSet ScanGrids( ulong userId, string line ) return new HashSet( ); } - if ( words.Length - 3 > options.Count ) - { - if ( ApplicationLog.BaseLog.IsDebugEnabled ) - { - ApplicationLog.BaseLog.Debug( "Essentials: Arguments: {0}", string.Join( " ", words ) ); - ApplicationLog.BaseLog.Debug( "Essentials: Options: {0}", string.Join( ",", options.Keys ) ); - } - Communication.SendPrivateInformation( userId, "Possible problem with your parameters (options provided is larger than options found). Not returning any results in case of error" ); - - return new HashSet( ); - } - + if (ApplicationLog.BaseLog.IsDebugEnabled) + { + ApplicationLog.BaseLog.Debug("Essentials: Arguments: {0}", string.Join(" ", words)); + ApplicationLog.BaseLog.Debug("Essentials: Options: {0}", string.Join(",", options.Keys)); + } + if ( !scanOptions.Quiet ) Communication.SendPrivateInformation( userId, string.Format( "Scanning for ships with options: {0}", GetOptionsText( options ) ) );