diff --git a/.gitignore b/.gitignore index 102567b..9f25a9a 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,17 @@ -HorseIsleServer/HorseIsleServer/bin/* -HorseIsleServer/HorseIsleServer/obj/* -HorseIsleServer/.vs/* +*bin/* +*obj/* +*.vs/* *GitCommit *.log -*.suo \ No newline at end of file +*.suo + +HorseIsleServer/N00BS/obj/* +HorseIsleServer/N00BS/bin/* + +HorseIsleServer/HISP/obj/* +HorseIsleServer/HISP/bin/* + +HorseIsleServer/LibHISP/obj/* +HorseIsleServer/LibHISP/bin/* + +HorseIsleServer/.vs/* \ No newline at end of file diff --git a/HorseIsleServer/HISP.sln b/HorseIsleServer/HISP.sln new file mode 100644 index 0000000..2998cec --- /dev/null +++ b/HorseIsleServer/HISP.sln @@ -0,0 +1,198 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32210.308 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibHISP", "LibHISP\LibHISP.csproj", "{C48CBD82-AB30-494A-8FFA-4DE7069B5827}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HISP", "HISP\HISP.csproj", "{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "N00BS", "N00BS\N00BS.csproj", "{6B45A1E8-0F54-4BF7-AF48-41B9FE676570}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Linux|Any CPU = Linux|Any CPU + Linux|ARM = Linux|ARM + Linux|ARM64 = Linux|ARM64 + Linux|x64 = Linux|x64 + Linux|x86 = Linux|x86 + MacOS|Any CPU = MacOS|Any CPU + MacOS|ARM = MacOS|ARM + MacOS|ARM64 = MacOS|ARM64 + MacOS|x64 = MacOS|x64 + MacOS|x86 = MacOS|x86 + Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + Windows|Any CPU = Windows|Any CPU + Windows|ARM = Windows|ARM + Windows|ARM64 = Windows|ARM64 + Windows|x64 = Windows|x64 + Windows|x86 = Windows|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.ActiveCfg = Debug|AnyCPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.Build.0 = Debug|AnyCPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM.ActiveCfg = Debug|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM.Build.0 = Debug|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM64.Build.0 = Debug|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x64.ActiveCfg = Debug|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x64.Build.0 = Debug|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x86.ActiveCfg = Debug|AnyCPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x86.Build.0 = Debug|AnyCPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|Any CPU.ActiveCfg = Linux|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|Any CPU.Build.0 = Linux|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.ActiveCfg = Linux|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.Build.0 = Linux|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM64.ActiveCfg = Linux|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM64.Build.0 = Linux|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x64.ActiveCfg = Linux|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x64.Build.0 = Linux|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x86.ActiveCfg = Linux|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x86.Build.0 = Linux|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|Any CPU.ActiveCfg = MacOS|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|Any CPU.Build.0 = MacOS|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM.ActiveCfg = MacOS|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM.Build.0 = MacOS|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM64.ActiveCfg = MacOS|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM64.Build.0 = MacOS|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x64.ActiveCfg = MacOS|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x64.Build.0 = MacOS|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x86.ActiveCfg = MacOS|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x86.Build.0 = MacOS|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|Any CPU.Build.0 = Debug|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|ARM.ActiveCfg = Windows|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|ARM.Build.0 = Windows|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|ARM64.ActiveCfg = Windows|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|ARM64.Build.0 = Windows|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|x64.ActiveCfg = Windows|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|x64.Build.0 = Windows|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|x86.ActiveCfg = Debug|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|x86.Build.0 = Debug|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|Any CPU.ActiveCfg = Windows|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|Any CPU.Build.0 = Windows|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM.ActiveCfg = Windows|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM.Build.0 = Windows|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM64.ActiveCfg = Windows|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM64.Build.0 = Windows|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x64.ActiveCfg = Windows|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x64.Build.0 = Windows|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x86.ActiveCfg = Windows|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x86.Build.0 = Windows|x86 + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|ARM.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|ARM.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|ARM64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|x64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|x64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|x86.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|x86.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|Any CPU.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|Any CPU.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|ARM.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|ARM.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|ARM64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|ARM64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|x64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|x64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|x86.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|x86.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|Any CPU.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|Any CPU.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|ARM.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|ARM.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|ARM64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|ARM64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|x64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|x64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|x86.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|x86.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|Any CPU.Build.0 = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM.ActiveCfg = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM.Build.0 = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM64.ActiveCfg = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM64.Build.0 = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x64.ActiveCfg = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x64.Build.0 = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x86.ActiveCfg = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x86.Build.0 = Release|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|Any CPU.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|Any CPU.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|ARM.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|ARM.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|ARM64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|ARM64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|x64.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|x64.Build.0 = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|x86.ActiveCfg = Debug|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|x86.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|ARM.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|ARM64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|x64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|x64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|x86.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|x86.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|Any CPU.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|Any CPU.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|ARM.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|ARM.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|ARM64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|ARM64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|x64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|x64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|x86.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|x86.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|Any CPU.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|Any CPU.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|ARM.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|ARM.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|ARM64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|ARM64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|x64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|x64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|x86.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.MacOS|x86.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|Any CPU.Build.0 = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|ARM.ActiveCfg = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|ARM.Build.0 = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|ARM64.ActiveCfg = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|ARM64.Build.0 = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|x64.ActiveCfg = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|x64.Build.0 = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|x86.ActiveCfg = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Release|x86.Build.0 = Release|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|Any CPU.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|Any CPU.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|ARM.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|ARM.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|ARM64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|ARM64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|x64.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|x64.Build.0 = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|x86.ActiveCfg = Debug|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Windows|x86.Build.0 = Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {52075F5B-6A74-493C-BA53-3AD720D643C2} + EndGlobalSection +EndGlobal diff --git a/HorseIsleServer/HISP/HISP - Shortcut.lnk b/HorseIsleServer/HISP/HISP - Shortcut.lnk new file mode 100644 index 0000000..d2a3e54 Binary files /dev/null and b/HorseIsleServer/HISP/HISP - Shortcut.lnk differ diff --git a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj b/HorseIsleServer/HISP/HISP.csproj similarity index 93% rename from HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj rename to HorseIsleServer/HISP/HISP.csproj index 83fc796..60a3a9f 100644 --- a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj +++ b/HorseIsleServer/HISP/HISP.csproj @@ -6,6 +6,9 @@ x64;x86;ARM;ARM64;AnyCPU Debug;Windows;Linux;MacOS + + + True @@ -13,13 +16,6 @@ Resources.resx - - - - - - - copy "$(SolutionDir)..\HorseIsleData\gamedata.json" "$(TargetDir)gamedata.json" /Y @@ -41,15 +37,14 @@ icon.ico HISP.Program OnBuildSuccess - embedded + none False none False - Public Domain, 2021 + Public Domain, 2022 https://islehorse.com https://github.com/islehorse/HISP git - C:\Users\Silica\Documents\GitHub\HISP\LICENSE @@ -187,7 +182,7 @@ - True + False OS_LINUX;ARCH_ANYCPU 3 1701;1702;2026 @@ -195,7 +190,7 @@ - True + False OS_WINDOWS;ARCH_ANYCPU 3 1701;1702;2026 @@ -203,7 +198,7 @@ - True + False OS_MACOS;ARCH_ANYCPU 3 1701;1702;2026 @@ -221,10 +216,8 @@ 3 1701;1702;2026 + True - - - diff --git a/HorseIsleServer/HISP/Program.cs b/HorseIsleServer/HISP/Program.cs new file mode 100644 index 0000000..16e6c81 --- /dev/null +++ b/HorseIsleServer/HISP/Program.cs @@ -0,0 +1,16 @@ +using HISP.Server; +using System; + +namespace HISP +{ + public static class Program + { + public static void Main(string[] args) + { + Logger.SetCallback(Console.WriteLine); + Start.InitalizeAndStart(); + + while (true) { /* Allow asyncronous operations to happen. */ }; + } + } +} diff --git a/HorseIsleServer/HorseIsleServer/Properties/AssemblyInfo.cs b/HorseIsleServer/HISP/Properties/AssemblyInfo.cs similarity index 86% rename from HorseIsleServer/HorseIsleServer/Properties/AssemblyInfo.cs rename to HorseIsleServer/HISP/Properties/AssemblyInfo.cs index 475210b..e22bdd6 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISP/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("SilicaAndPina")] [assembly: AssemblyProduct("HISP")] -[assembly: AssemblyCopyright("Public Domain © 2021")] +[assembly: AssemblyCopyright("Public Domain © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c48cbd82-ab30-494a-8ffa-4de7069b5827")] +[assembly: Guid("57264c6b-1461-41d6-9304-3890cf6c8390")] // Version information for an assembly consists of the following four values: // @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] +[assembly: AssemblyVersion("1.3.0.0")] +[assembly: AssemblyFileVersion("1.3.0.0")] diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/Linux64.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/Linux64.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/LinuxARM.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/LinuxARM.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/LinuxARM64.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/LinuxARM64.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/Osx64.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/Osx64.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/OsxARM64.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/OsxARM64.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/OsxARM64.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/Win32.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/Win32.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/Win64.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/Win64.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/WinARM.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/WinARM.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/HISP/Properties/PublishProfiles/WinARM64.pubxml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml rename to HorseIsleServer/HISP/Properties/PublishProfiles/WinARM64.pubxml diff --git a/HorseIsleServer/HorseIsleServer/Properties/Resources.Designer.cs b/HorseIsleServer/HISP/Properties/Resources.Designer.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/Resources.Designer.cs rename to HorseIsleServer/HISP/Properties/Resources.Designer.cs diff --git a/HorseIsleServer/HISP/Properties/Resources.resx b/HorseIsleServer/HISP/Properties/Resources.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HorseIsleServer/HISP/Properties/Resources.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/HorseIsleServer/HorseIsleServer/Properties/launchSettings.json b/HorseIsleServer/HISP/Properties/launchSettings.json similarity index 69% rename from HorseIsleServer/HorseIsleServer/Properties/launchSettings.json rename to HorseIsleServer/HISP/Properties/launchSettings.json index 0b242de..e6013fa 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/launchSettings.json +++ b/HorseIsleServer/HISP/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "HorseIsleServer": { + "HISP": { "commandName": "Project" } } diff --git a/HorseIsleServer/HorseIsleServer/icon.ico b/HorseIsleServer/HISP/icon.ico similarity index 100% rename from HorseIsleServer/HorseIsleServer/icon.ico rename to HorseIsleServer/HISP/icon.ico diff --git a/HorseIsleServer/HorseIsleServer.sln b/HorseIsleServer/HorseIsleServer.sln deleted file mode 100644 index d4881b3..0000000 --- a/HorseIsleServer/HorseIsleServer.sln +++ /dev/null @@ -1,79 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HorseIsleServer", "HorseIsleServer\HorseIsleServer.csproj", "{C48CBD82-AB30-494A-8FFA-4DE7069B5827}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Linux|Any CPU = Linux|Any CPU - Linux|ARM = Linux|ARM - Linux|ARM64 = Linux|ARM64 - Linux|x64 = Linux|x64 - Linux|x86 = Linux|x86 - MacOS|Any CPU = MacOS|Any CPU - MacOS|ARM = MacOS|ARM - MacOS|ARM64 = MacOS|ARM64 - MacOS|x64 = MacOS|x64 - MacOS|x86 = MacOS|x86 - Windows|Any CPU = Windows|Any CPU - Windows|ARM = Windows|ARM - Windows|ARM64 = Windows|ARM64 - Windows|x64 = Windows|x64 - Windows|x86 = Windows|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.ActiveCfg = Debug|AnyCPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.Build.0 = Debug|AnyCPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM.ActiveCfg = Debug|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM.Build.0 = Debug|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM64.Build.0 = Debug|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x64.ActiveCfg = Debug|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x64.Build.0 = Debug|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x86.ActiveCfg = Debug|AnyCPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x86.Build.0 = Debug|AnyCPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|Any CPU.ActiveCfg = Linux|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|Any CPU.Build.0 = Linux|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.ActiveCfg = Linux|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.Build.0 = Linux|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM64.ActiveCfg = Linux|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM64.Build.0 = Linux|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x64.ActiveCfg = Linux|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x64.Build.0 = Linux|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x86.ActiveCfg = Linux|x86 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x86.Build.0 = Linux|x86 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|Any CPU.ActiveCfg = MacOS|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|Any CPU.Build.0 = MacOS|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM.ActiveCfg = MacOS|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM.Build.0 = MacOS|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM64.ActiveCfg = MacOS|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM64.Build.0 = MacOS|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x64.ActiveCfg = MacOS|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x64.Build.0 = MacOS|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x86.ActiveCfg = MacOS|x86 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x86.Build.0 = MacOS|x86 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|Any CPU.ActiveCfg = Windows|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|Any CPU.Build.0 = Windows|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM.ActiveCfg = Windows|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM.Build.0 = Windows|ARM - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM64.ActiveCfg = Windows|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM64.Build.0 = Windows|ARM64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x64.ActiveCfg = Windows|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x64.Build.0 = Windows|x64 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x86.ActiveCfg = Windows|x86 - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x86.Build.0 = Windows|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {52075F5B-6A74-493C-BA53-3AD720D643C2} - EndGlobalSection -EndGlobal diff --git a/HorseIsleServer/HorseIsleServer/Game/AbuseReport.cs b/HorseIsleServer/LibHISP/Game/AbuseReport.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/AbuseReport.cs rename to HorseIsleServer/LibHISP/Game/AbuseReport.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Arena.cs b/HorseIsleServer/LibHISP/Game/Arena.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Arena.cs rename to HorseIsleServer/LibHISP/Game/Arena.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Book.cs b/HorseIsleServer/LibHISP/Game/Book.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Book.cs rename to HorseIsleServer/LibHISP/Game/Book.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs b/HorseIsleServer/LibHISP/Game/Chat/Chat.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs rename to HorseIsleServer/LibHISP/Game/Chat/Chat.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs b/HorseIsleServer/LibHISP/Game/Chat/Command.cs similarity index 99% rename from HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs rename to HorseIsleServer/LibHISP/Game/Chat/Command.cs index 3d1b58a..5817d09 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs +++ b/HorseIsleServer/LibHISP/Game/Chat/Command.cs @@ -60,7 +60,6 @@ namespace HISP.Game.Chat byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message.Substring(1)), PacketBuilder.CHAT_BOTTOM_LEFT); user.LoggedinClient.SendPacket(chatPacket); - Program.ShuttingDown = true; Thread.Sleep(1000); // give it a few seconds to shut down, if it doesnt force exit Environment.Exit(0); return true; diff --git a/HorseIsleServer/HorseIsleServer/Game/Chat/SocialType.cs b/HorseIsleServer/LibHISP/Game/Chat/SocialType.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Chat/SocialType.cs rename to HorseIsleServer/LibHISP/Game/Chat/SocialType.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/IsleCardTradingGame.cs b/HorseIsleServer/LibHISP/Game/Events/IsleCardTradingGame.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Events/IsleCardTradingGame.cs rename to HorseIsleServer/LibHISP/Game/Events/IsleCardTradingGame.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/ModsRevenge.cs b/HorseIsleServer/LibHISP/Game/Events/ModsRevenge.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Events/ModsRevenge.cs rename to HorseIsleServer/LibHISP/Game/Events/ModsRevenge.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/RandomEvent.cs b/HorseIsleServer/LibHISP/Game/Events/RandomEvent.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Events/RandomEvent.cs rename to HorseIsleServer/LibHISP/Game/Events/RandomEvent.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/RealTimeQuiz.cs b/HorseIsleServer/LibHISP/Game/Events/RealTimeQuiz.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Events/RealTimeQuiz.cs rename to HorseIsleServer/LibHISP/Game/Events/RealTimeQuiz.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/RealTimeRiddle.cs b/HorseIsleServer/LibHISP/Game/Events/RealTimeRiddle.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Events/RealTimeRiddle.cs rename to HorseIsleServer/LibHISP/Game/Events/RealTimeRiddle.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/TackShopGiveaway.cs b/HorseIsleServer/LibHISP/Game/Events/TackShopGiveaway.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Events/TackShopGiveaway.cs rename to HorseIsleServer/LibHISP/Game/Events/TackShopGiveaway.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/WaterBalloonGame.cs b/HorseIsleServer/LibHISP/Game/Events/WaterBalloonGame.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Events/WaterBalloonGame.cs rename to HorseIsleServer/LibHISP/Game/Events/WaterBalloonGame.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/GameExceptions.cs b/HorseIsleServer/LibHISP/Game/GameExceptions.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/GameExceptions.cs rename to HorseIsleServer/LibHISP/Game/GameExceptions.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Horse/HorseInfo.cs b/HorseIsleServer/LibHISP/Game/Horse/HorseInfo.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Horse/HorseInfo.cs rename to HorseIsleServer/LibHISP/Game/Horse/HorseInfo.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Horse/HorseInstance.cs b/HorseIsleServer/LibHISP/Game/Horse/HorseInstance.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Horse/HorseInstance.cs rename to HorseIsleServer/LibHISP/Game/Horse/HorseInstance.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Horse/Leaser.cs b/HorseIsleServer/LibHISP/Game/Horse/Leaser.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Horse/Leaser.cs rename to HorseIsleServer/LibHISP/Game/Horse/Leaser.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Horse/WildHorse.cs b/HorseIsleServer/LibHISP/Game/Horse/WildHorse.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Horse/WildHorse.cs rename to HorseIsleServer/LibHISP/Game/Horse/WildHorse.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Inventory/HorseInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/HorseInventory.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Inventory/HorseInventory.cs rename to HorseIsleServer/LibHISP/Game/Inventory/HorseInventory.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Inventory/IInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/IInventory.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Inventory/IInventory.cs rename to HorseIsleServer/LibHISP/Game/Inventory/IInventory.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Inventory/InventoryItem.cs b/HorseIsleServer/LibHISP/Game/Inventory/InventoryItem.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Inventory/InventoryItem.cs rename to HorseIsleServer/LibHISP/Game/Inventory/InventoryItem.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Inventory/PlayerInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/PlayerInventory.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Inventory/PlayerInventory.cs rename to HorseIsleServer/LibHISP/Game/Inventory/PlayerInventory.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Inventory/ShopInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/ShopInventory.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Inventory/ShopInventory.cs rename to HorseIsleServer/LibHISP/Game/Inventory/ShopInventory.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Items/DroppedItems.cs b/HorseIsleServer/LibHISP/Game/Items/DroppedItems.cs similarity index 95% rename from HorseIsleServer/HorseIsleServer/Game/Items/DroppedItems.cs rename to HorseIsleServer/LibHISP/Game/Items/DroppedItems.cs index 8dd0515..4dcf3d3 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Items/DroppedItems.cs +++ b/HorseIsleServer/LibHISP/Game/Items/DroppedItems.cs @@ -134,26 +134,21 @@ namespace HISP.Game.Items droppedItemsList.Add(droppedItem); Database.AddDroppedItem(droppedItem); } - public static void GenerateItems(bool isFirstLoad=false) + public static void GenerateItems() { - if (isFirstLoad) - Logger.InfoPrint("Generating items, (this may take awhile on a fresh database!)"); - else - Logger.DebugPrint("Generating items."); + Logger.DebugPrint("Generating items."); int newItems = 0; foreach (Item.ItemInformation item in Item.Items) { int count = GetCountOfItem(item); - do - { + //do + //{ if (count < item.SpawnParamaters.SpawnCap) { count++; int despawnTimer = 1440; - if (isFirstLoad) - despawnTimer = GameServer.RandomNumberGenerator.Next(0, 1440 + 1); if (item.SpawnParamaters.SpawnInZone != null) { @@ -324,7 +319,7 @@ namespace HISP.Game.Items } } - } while (isFirstLoad && (count < item.SpawnParamaters.SpawnCap)); + //} while (count < item.SpawnParamaters.SpawnCap); } @@ -342,7 +337,7 @@ namespace HISP.Game.Items public static void Init() { ReadFromDatabase(); - GenerateItems(Database.GetDroppedItemsCount() <= 0); + GenerateItems(); } } diff --git a/HorseIsleServer/HorseIsleServer/Game/Items/Item.cs b/HorseIsleServer/LibHISP/Game/Items/Item.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Items/Item.cs rename to HorseIsleServer/LibHISP/Game/Items/Item.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Items/ItemInstance.cs b/HorseIsleServer/LibHISP/Game/Items/ItemInstance.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Items/ItemInstance.cs rename to HorseIsleServer/LibHISP/Game/Items/ItemInstance.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Items/Tack.cs b/HorseIsleServer/LibHISP/Game/Items/Tack.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Items/Tack.cs rename to HorseIsleServer/LibHISP/Game/Items/Tack.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Map.cs b/HorseIsleServer/LibHISP/Game/Map.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Map.cs rename to HorseIsleServer/LibHISP/Game/Map.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Messages.cs b/HorseIsleServer/LibHISP/Game/Messages.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Messages.cs rename to HorseIsleServer/LibHISP/Game/Messages.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Meta.cs b/HorseIsleServer/LibHISP/Game/Meta.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Meta.cs rename to HorseIsleServer/LibHISP/Game/Meta.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Multiroom.cs b/HorseIsleServer/LibHISP/Game/Multiroom.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Multiroom.cs rename to HorseIsleServer/LibHISP/Game/Multiroom.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Npc.cs b/HorseIsleServer/LibHISP/Game/Npc.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Npc.cs rename to HorseIsleServer/LibHISP/Game/Npc.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Quest.cs b/HorseIsleServer/LibHISP/Game/Quest.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Quest.cs rename to HorseIsleServer/LibHISP/Game/Quest.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Ranch.cs b/HorseIsleServer/LibHISP/Game/Ranch.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Ranch.cs rename to HorseIsleServer/LibHISP/Game/Ranch.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Riddler.cs b/HorseIsleServer/LibHISP/Game/Riddler.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Riddler.cs rename to HorseIsleServer/LibHISP/Game/Riddler.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Auction.cs b/HorseIsleServer/LibHISP/Game/Services/Auction.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Auction.cs rename to HorseIsleServer/LibHISP/Game/Services/Auction.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Barn.cs b/HorseIsleServer/LibHISP/Game/Services/Barn.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Barn.cs rename to HorseIsleServer/LibHISP/Game/Services/Barn.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Farrier.cs b/HorseIsleServer/LibHISP/Game/Services/Farrier.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Farrier.cs rename to HorseIsleServer/LibHISP/Game/Services/Farrier.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Groomer.cs b/HorseIsleServer/LibHISP/Game/Services/Groomer.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Groomer.cs rename to HorseIsleServer/LibHISP/Game/Services/Groomer.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Inn.cs b/HorseIsleServer/LibHISP/Game/Services/Inn.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Inn.cs rename to HorseIsleServer/LibHISP/Game/Services/Inn.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Pawneer.cs b/HorseIsleServer/LibHISP/Game/Services/Pawneer.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Pawneer.cs rename to HorseIsleServer/LibHISP/Game/Services/Pawneer.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Shop.cs b/HorseIsleServer/LibHISP/Game/Services/Shop.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Shop.cs rename to HorseIsleServer/LibHISP/Game/Services/Shop.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Trainer.cs b/HorseIsleServer/LibHISP/Game/Services/Trainer.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Trainer.cs rename to HorseIsleServer/LibHISP/Game/Services/Trainer.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Transport.cs b/HorseIsleServer/LibHISP/Game/Services/Transport.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Transport.cs rename to HorseIsleServer/LibHISP/Game/Services/Transport.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Vet.cs b/HorseIsleServer/LibHISP/Game/Services/Vet.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Vet.cs rename to HorseIsleServer/LibHISP/Game/Services/Vet.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Workshop.cs b/HorseIsleServer/LibHISP/Game/Services/Workshop.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Services/Workshop.cs rename to HorseIsleServer/LibHISP/Game/Services/Workshop.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/SwfModules/Brickpoet.cs b/HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/SwfModules/Brickpoet.cs rename to HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/SwfModules/Drawingroom.cs b/HorseIsleServer/LibHISP/Game/SwfModules/Drawingroom.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/SwfModules/Drawingroom.cs rename to HorseIsleServer/LibHISP/Game/SwfModules/Drawingroom.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/SwfModules/Dressup.cs b/HorseIsleServer/LibHISP/Game/SwfModules/Dressup.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/SwfModules/Dressup.cs rename to HorseIsleServer/LibHISP/Game/SwfModules/Dressup.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Tracking.cs b/HorseIsleServer/LibHISP/Game/Tracking.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Tracking.cs rename to HorseIsleServer/LibHISP/Game/Tracking.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/Treasure.cs b/HorseIsleServer/LibHISP/Game/Treasure.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/Treasure.cs rename to HorseIsleServer/LibHISP/Game/Treasure.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/TwoPlayer.cs b/HorseIsleServer/LibHISP/Game/TwoPlayer.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/TwoPlayer.cs rename to HorseIsleServer/LibHISP/Game/TwoPlayer.cs diff --git a/HorseIsleServer/HorseIsleServer/Game/World.cs b/HorseIsleServer/LibHISP/Game/World.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Game/World.cs rename to HorseIsleServer/LibHISP/Game/World.cs diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj new file mode 100644 index 0000000..98b65a1 --- /dev/null +++ b/HorseIsleServer/LibHISP/LibHISP.csproj @@ -0,0 +1,216 @@ + + + Library + HISP + 10.0 + x64;x86;ARM;ARM64;AnyCPU + Debug;Windows;Linux;MacOS + + + + True + True + Resources.resx + + + + + + + + + false + false + + + net6.0 + false + true + OnBuildSuccess + embedded + False + none + False + Public Domain, 2022 + https://islehorse.com + https://github.com/islehorse/HISP + git + + + + win-x86 + true + x86 + OS_WINDOWS;ARCH_X86 + 3 + 1701;1702;2026 + + + win-x64 + true + x64 + OS_WINDOWS;ARCH_X86_64 + 3 + 1701;1702;2026 + + + win-arm + true + ARM32 + OS_WINDOWS;ARCH_ARM + 3 + 1701;1702;2026 + + + win-arm64 + true + ARM64 + OS_WINDOWS;ARCH_ARM64 + 3 + 1701;1702;2026 + + + + + linux-x64 + true + x64 + OS_LINUX;ARCH_X86_64 + 3 + 1701;1702;2026 + + + linux-arm + ARM + true + OS_LINUX;ARCH_ARM + 3 + 1701;1702;2026 + + + linux-arm64 + ARM64 + true + OS_LINUX;ARCH_ARM64 + 3 + 1701;1702;2026 + + + + osx-x64 + true + x64 + OS_MACOS;ARCH_X86_64 + 3 + 1701;1702;2026 + + + osx-arm64 + true + OS_MACOS;ARCH_ARM64 + 3 + 1701;1702;2026 + + + + + net6.0 + win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64 + True + OS_ALL;ARCH_ANYCPU + + + + + ARM32 + False + DEBUG;TRACE;OS_DEBUG;ARCH_ARM + 3 + 1701;1702;2026 + + + + + ARM64 + False + DEBUG;TRACE;OS_DEBUG;ARCH_ARM64 + 3 + 1701;1702;2026 + + + + + False + DEBUG;TRACE;OS_DEBUG;ARCH_X86_64 + 3 + 1701;1702;2026 + + + + + False + DEBUG;TRACE;OS_DEBUG;ARCH_X86 + 3 + 1701;1702;2026 + + + + + True + OS_MACOS;ARCH_X86 + 3 + 1701;1702;2026 + + + + + True + OS_LINUX;ARCH_X86 + 3 + 1701;1702;2026 + + + + + False + OS_LINUX;ARCH_ANYCPU + 3 + 1701;1702;2026 + + + + + False + OS_WINDOWS;ARCH_ANYCPU + 3 + 1701;1702;2026 + + + + + False + OS_MACOS;ARCH_ANYCPU + 3 + 1701;1702;2026 + + + + + True + OS_MACOS;ARCH_ARM + 3 + 1701;1702;2026 + + + + + 3 + 1701;1702;2026 + True + + + + + + + diff --git a/HorseIsleServer/HorseIsleServer/Player/Award.cs b/HorseIsleServer/LibHISP/Player/Award.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Award.cs rename to HorseIsleServer/LibHISP/Player/Award.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/Dance.cs b/HorseIsleServer/LibHISP/Player/Dance.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Dance.cs rename to HorseIsleServer/LibHISP/Player/Dance.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/Equips/CompetitionGear.cs b/HorseIsleServer/LibHISP/Player/Equips/CompetitionGear.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Equips/CompetitionGear.cs rename to HorseIsleServer/LibHISP/Player/Equips/CompetitionGear.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/Equips/Jewelry.cs b/HorseIsleServer/LibHISP/Player/Equips/Jewelry.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Equips/Jewelry.cs rename to HorseIsleServer/LibHISP/Player/Equips/Jewelry.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/Friends.cs b/HorseIsleServer/LibHISP/Player/Friends.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Friends.cs rename to HorseIsleServer/LibHISP/Player/Friends.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/Highscore.cs b/HorseIsleServer/LibHISP/Player/Highscore.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Highscore.cs rename to HorseIsleServer/LibHISP/Player/Highscore.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/Mailbox.cs b/HorseIsleServer/LibHISP/Player/Mailbox.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Mailbox.cs rename to HorseIsleServer/LibHISP/Player/Mailbox.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/MutedPlayers.cs b/HorseIsleServer/LibHISP/Player/MutedPlayers.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/MutedPlayers.cs rename to HorseIsleServer/LibHISP/Player/MutedPlayers.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/PlayerQuests.cs b/HorseIsleServer/LibHISP/Player/PlayerQuests.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/PlayerQuests.cs rename to HorseIsleServer/LibHISP/Player/PlayerQuests.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/TrackedQuest.cs b/HorseIsleServer/LibHISP/Player/TrackedQuest.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/TrackedQuest.cs rename to HorseIsleServer/LibHISP/Player/TrackedQuest.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/Trade.cs b/HorseIsleServer/LibHISP/Player/Trade.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/Trade.cs rename to HorseIsleServer/LibHISP/Player/Trade.cs diff --git a/HorseIsleServer/HorseIsleServer/Player/User.cs b/HorseIsleServer/LibHISP/Player/User.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Player/User.cs rename to HorseIsleServer/LibHISP/Player/User.cs diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..313aac9 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("HISP")] +[assembly: AssemblyDescription("Server Emulator for \"Horse Isle\"")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("SilicaAndPina")] +[assembly: AssemblyProduct("HISP")] +[assembly: AssemblyCopyright("Public Domain © 2022")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("31f0bdf5-f6d1-4aeb-8905-80dbc223c836")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.3.0.0")] +[assembly: AssemblyFileVersion("1.3.0.0")] diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Linux64.pubxml new file mode 100644 index 0000000..1115827 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Linux64.pubxml @@ -0,0 +1,19 @@ + + + + + Linux + x64 + bin\x64\Linux\net6.0\linux-x64\publish\ + FileSystem + net6.0 + linux-x64 + True + + True + True + OS_LINUX;ARCH_X86_64 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM.pubxml new file mode 100644 index 0000000..cc21064 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM.pubxml @@ -0,0 +1,19 @@ + + + + + Linux + ARM + bin\ARM\Linux\net6.0\linux-arm\publish\ + FileSystem + net6.0 + linux-arm + True + + True + True + OS_LINUX;ARCH_ARM + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM64.pubxml new file mode 100644 index 0000000..7aef131 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM64.pubxml @@ -0,0 +1,19 @@ + + + + + Linux + ARM64 + bin\ARM64\Linux\net6.0\linux-arm64\publish\ + FileSystem + net6.0 + linux-arm64 + True + + True + True + OS_LINUX;ARCH_ARM64 + + diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Osx64.pubxml new file mode 100644 index 0000000..8d1be6f --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Osx64.pubxml @@ -0,0 +1,19 @@ + + + + + MacOS + x64 + bin\x64\MacOS\net6.0\osx-x64\publish\ + FileSystem + net6.0 + osx-x64 + True + + True + True + OS_MACOS;ARCH_X86_64 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml new file mode 100644 index 0000000..8b8328e --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml @@ -0,0 +1,19 @@ + + + + + MacOS + ARM64 + bin\arm64\MacOS\net6.0\osx-arm64\publish\ + FileSystem + net6.0 + osx-arm64 + True + + True + True + OS_MACOS;ARCH_ARM64 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml new file mode 100644 index 0000000..5eb1a87 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + x86 + bin\x86\Windows\net6.0\win-x86\publish\ + FileSystem + net6.0 + win-x86 + True + + True + True + OS_WINDOWS;ARCH_X86 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml new file mode 100644 index 0000000..6b056c9 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + x64 + bin\x64\Windows\net6.0\win-x64\publish\ + FileSystem + net6.0 + win-x64 + True + + True + True + OS_WINDOWS;ARCH_X86_64 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM.pubxml new file mode 100644 index 0000000..03461a2 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + ARM + bin\arm\Windows\net6.0\windows-arm\publish\ + FileSystem + net6.0 + win-arm + True + + True + True + OS_WINDOWS;ARCH_ARM + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM64.pubxml new file mode 100644 index 0000000..b843480 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM64.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + ARM64 + bin\arm64\Windows\net6.0\windows-arm64\publish\ + FileSystem + net6.0 + win-arm64 + True + + True + True + OS_WINDOWS;ARCH_ARM64 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs b/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs new file mode 100644 index 0000000..aecea91 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs @@ -0,0 +1,118 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace HISP.Properties { + using System; + + + /// + /// A strongly-typed resource public class, for looking up localized strings, etc. + /// + // This public class was auto-generated by the StronglyTypedResourceBuilder + // public class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this public class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HISP.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource public class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to <cross-domain-policy> + /// <allow-access-from domain="*" to-ports="12321" secure="false"/> + ///</cross-domain-policy>. + /// + internal static string DefaultCrossDomain { + get { + return ResourceManager.GetString("DefaultCrossDomain", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to # HorseIsleServer Default Configuration File + /// + ///# Ip address the server will bind to (default: 0.0.0.0 ALL INTERFACES) + ///ip=0.0.0.0 + ///# Port the server will bind to (default: 12321) + ///port=12321 + /// + ///# MariaDB Database + ///db_ip=127.0.0.1 + ///db_name=beta + ///db_username=root + ///db_password=test123 + ///db_port=3306 + /// + ///# Map Data + ///map=HI1.MAP + /// + ///# JSON Format Data + /// + ///gamedata=gamedata.json + /// + ///# Cross-Domain Policy File + ///crossdomain=CrossDomainPolicy.xml + /// + ///# Red Text Stating "Todays Note:" + ///motd=April 11, 2020. New breed, C [rest of string was truncated]";. + /// + internal static string DefaultServerProperties { + get { + return ResourceManager.GetString("DefaultServerProperties", resourceCulture); + } + } + + /// + /// UNKNOWN COMMIT HASH + /// + internal static string GitCommit { + get { + return ResourceManager.GetString("GitCommit", resourceCulture); + } + } + + } +} diff --git a/HorseIsleServer/HorseIsleServer/Properties/Resources.resx b/HorseIsleServer/LibHISP/Properties/Resources.resx similarity index 100% rename from HorseIsleServer/HorseIsleServer/Properties/Resources.resx rename to HorseIsleServer/LibHISP/Properties/Resources.resx diff --git a/HorseIsleServer/LibHISP/Properties/launchSettings.json b/HorseIsleServer/LibHISP/Properties/launchSettings.json new file mode 100644 index 0000000..c5b9af2 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "LibHISP": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/HorseIsleServer/HorseIsleServer/Resources/default_cross_domain.xml b/HorseIsleServer/LibHISP/Resources/default_cross_domain.xml similarity index 100% rename from HorseIsleServer/HorseIsleServer/Resources/default_cross_domain.xml rename to HorseIsleServer/LibHISP/Resources/default_cross_domain.xml diff --git a/HorseIsleServer/HorseIsleServer/Resources/server.properties b/HorseIsleServer/LibHISP/Resources/server.properties similarity index 97% rename from HorseIsleServer/HorseIsleServer/Resources/server.properties rename to HorseIsleServer/LibHISP/Resources/server.properties index b0f1baa..5e1a8cb 100644 --- a/HorseIsleServer/HorseIsleServer/Resources/server.properties +++ b/HorseIsleServer/LibHISP/Resources/server.properties @@ -19,6 +19,9 @@ db_username=root db_password=test123 db_port=3306 +# Connect to a sqllite database instead of a sql server. +sql_lite=false + # File that contains the map tile data # the default was downloaded from the original server map=HI1.MAP diff --git a/HorseIsleServer/HorseIsleServer/Security/Authentication.cs b/HorseIsleServer/LibHISP/Security/Authentication.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Security/Authentication.cs rename to HorseIsleServer/LibHISP/Security/Authentication.cs diff --git a/HorseIsleServer/HorseIsleServer/Security/BBCode.cs b/HorseIsleServer/LibHISP/Security/BBCode.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Security/BBCode.cs rename to HorseIsleServer/LibHISP/Security/BBCode.cs diff --git a/HorseIsleServer/HorseIsleServer/Security/CrossDomainPolicy.cs b/HorseIsleServer/LibHISP/Security/CrossDomainPolicy.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Security/CrossDomainPolicy.cs rename to HorseIsleServer/LibHISP/Security/CrossDomainPolicy.cs diff --git a/HorseIsleServer/HorseIsleServer/Security/RandomID.cs b/HorseIsleServer/LibHISP/Security/RandomID.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Security/RandomID.cs rename to HorseIsleServer/LibHISP/Security/RandomID.cs diff --git a/HorseIsleServer/HorseIsleServer/Server/ConfigReader.cs b/HorseIsleServer/LibHISP/Server/ConfigReader.cs similarity index 95% rename from HorseIsleServer/HorseIsleServer/Server/ConfigReader.cs rename to HorseIsleServer/LibHISP/Server/ConfigReader.cs index 0b93e1b..4756a8a 100644 --- a/HorseIsleServer/HorseIsleServer/Server/ConfigReader.cs +++ b/HorseIsleServer/LibHISP/Server/ConfigReader.cs @@ -22,6 +22,8 @@ namespace HISP.Server public static string CrossDomainPolicyFile = "CrossDomainPolicy.xml"; public static int LogLevel = 4; + + public static bool SqlLite = false; public static bool EnableSpamFilter = true; public static bool AllUsersSubbed = false; public static bool FixOfficalBugs = false; @@ -29,7 +31,7 @@ namespace HISP.Server public static bool DoCorrections = true; public static bool DoNonViolations = true; - private static string ConfigurationFileName = "server.properties"; + public static string ConfigurationFileName = "server.properties"; public static void OpenConfig() { if (!File.Exists(ConfigurationFileName)) @@ -101,6 +103,9 @@ namespace HISP.Server case "enable_corrections": DoCorrections = data == "true"; break; + case "sql_lite": + SqlLite = data == "true"; + break; case "enable_non_violation_check": DoNonViolations = data == "true"; break; diff --git a/HorseIsleServer/HorseIsleServer/Server/Database.cs b/HorseIsleServer/LibHISP/Server/Database.cs similarity index 63% rename from HorseIsleServer/HorseIsleServer/Server/Database.cs rename to HorseIsleServer/LibHISP/Server/Database.cs index c7a322b..e0fdd11 100644 --- a/HorseIsleServer/HorseIsleServer/Server/Database.cs +++ b/HorseIsleServer/LibHISP/Server/Database.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using MySqlConnector; using HISP.Game; using HISP.Player; using HISP.Game.Horse; @@ -10,23 +9,53 @@ using HISP.Security; using HISP.Game.Services; using HISP.Game.SwfModules; +using MySqlConnector; +using Microsoft.Data.Sqlite; +using System.Data.Common; + namespace HISP.Server { public class Database { public static string ConnectionString = ""; + private static int addWithValue(DbCommand cmd, string param, object value) + { + DbParameter parameter = cmd.CreateParameter(); + parameter.ParameterName = param; + + if (value == null) + parameter.Value = DBNull.Value; + else + parameter.Value = value; + + return cmd.Parameters.Add(parameter); + } + + private static DbConnection connectDb() + { + if (!ConfigReader.SqlLite) + return new MySqlConnection(ConnectionString); + else + return new SqliteConnection(ConnectionString); + } public static void OpenDatabase() { - ConnectionString = "server=" + ConfigReader.DatabaseIP + ";user=" + ConfigReader.DatabaseUsername + ";password=" + ConfigReader.DatabasePassword + ";database=" + ConfigReader.DatabaseName; - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + if (!ConfigReader.SqlLite) + ConnectionString = "server=" + ConfigReader.DatabaseIP + ";user=" + ConfigReader.DatabaseUsername + ";password=" + ConfigReader.DatabasePassword + ";database=" + ConfigReader.DatabaseName; + else + ConnectionString = "Data Source=./" + ConfigReader.DatabaseName + ".db;"; + + Logger.InfoPrint(ConnectionString); + + using (DbConnection db = connectDb()) { try { db.Open(); } - catch (MySqlException e) + catch (DbException e) { Logger.ErrorPrint("Failed to connect to Database: "+e.Message); Environment.Exit(1); @@ -72,7 +101,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = ItemQueue; sqlCommand.ExecuteNonQuery(); } @@ -83,7 +112,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = SolvedRealTimeRiddles; sqlCommand.ExecuteNonQuery(); } @@ -95,7 +124,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = MutedPlayers; sqlCommand.ExecuteNonQuery(); @@ -107,7 +136,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = MessageQueue; sqlCommand.ExecuteNonQuery(); @@ -119,7 +148,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = SolvedRealTimeRiddle; sqlCommand.ExecuteNonQuery(); @@ -131,7 +160,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = DressupRooms; sqlCommand.ExecuteNonQuery(); @@ -144,7 +173,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = AuctionTable; sqlCommand.ExecuteNonQuery(); @@ -156,7 +185,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = NpcPos; sqlCommand.ExecuteNonQuery(); @@ -170,7 +199,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = RiddlesComplete; sqlCommand.ExecuteNonQuery(); @@ -183,7 +212,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = Ranches; sqlCommand.ExecuteNonQuery(); @@ -196,7 +225,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = Treasure; sqlCommand.ExecuteNonQuery(); @@ -210,7 +239,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = SavedDrawings; sqlCommand.ExecuteNonQuery(); @@ -223,7 +252,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = DrawingRooms; sqlCommand.ExecuteNonQuery(); @@ -237,7 +266,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = TrackingStats; sqlCommand.ExecuteNonQuery(); @@ -252,7 +281,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = Horses; sqlCommand.ExecuteNonQuery(); @@ -266,7 +295,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = UserTable; sqlCommand.ExecuteNonQuery(); @@ -279,7 +308,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = AbuseReorts; sqlCommand.ExecuteNonQuery(); @@ -291,7 +320,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = ExtTable; sqlCommand.ExecuteNonQuery(); @@ -304,7 +333,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = MailTable; sqlCommand.ExecuteNonQuery(); @@ -317,7 +346,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = BuddyTable; sqlCommand.ExecuteNonQuery(); @@ -330,7 +359,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = Jewelry; sqlCommand.ExecuteNonQuery(); @@ -343,7 +372,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = WeatherTable; sqlCommand.ExecuteNonQuery(); @@ -356,7 +385,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = Awards; sqlCommand.ExecuteNonQuery(); @@ -369,7 +398,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = DroppedItems; sqlCommand.ExecuteNonQuery(); @@ -382,7 +411,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = InventoryTable; sqlCommand.ExecuteNonQuery(); @@ -395,7 +424,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = ShopInventory; sqlCommand.ExecuteNonQuery(); @@ -407,7 +436,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = TrackedQuest; sqlCommand.ExecuteNonQuery(); @@ -419,7 +448,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = PoetryRooms; sqlCommand.ExecuteNonQuery(); @@ -432,7 +461,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = BannedPlayers; sqlCommand.ExecuteNonQuery(); @@ -445,7 +474,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = CompetitionGear; sqlCommand.ExecuteNonQuery(); @@ -458,7 +487,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = NpcStartPoint; sqlCommand.ExecuteNonQuery(); @@ -471,7 +500,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = LastPlayer; sqlCommand.ExecuteNonQuery(); @@ -485,7 +514,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = WildHorse; sqlCommand.ExecuteNonQuery(); @@ -500,13 +529,13 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = WorldTable; sqlCommand.ExecuteNonQuery(); sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO World VALUES(0,0,0,@startDate)"; - sqlCommand.Parameters.AddWithValue("@startDate", (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds); + addWithValue(sqlCommand, "@startDate", (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -520,7 +549,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = Leaderboards; sqlCommand.ExecuteNonQuery(); @@ -533,7 +562,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = DeleteOnlineUsers; sqlCommand.ExecuteNonQuery(); @@ -545,7 +574,7 @@ namespace HISP.Server try { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = OnlineUsers; sqlCommand.ExecuteNonQuery(); @@ -560,12 +589,12 @@ namespace HISP.Server public static void DeleteRanchOwner(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -574,14 +603,14 @@ namespace HISP.Server public static int[] GetMutedPlayers(int playerId) { List MutedPlayerIds = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT mutePlayerId FROM MutedPlayers WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) MutedPlayerIds.Add(reader.GetInt32(0)); @@ -590,13 +619,13 @@ namespace HISP.Server } public static void AddMutedPlayer(int playerId, int playerToMute) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO MutedPlayers VALUES(@playerId, @mutedPlayerId)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@mutedPlayerId", playerToMute); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@mutedPlayerId", playerToMute); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -605,13 +634,13 @@ namespace HISP.Server public static void DeleteMutedPlayer(int playerId, int playerToMute) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM MutedPlayers WHERE playerId=@playerId AND mutePlayerId=@mutedPlayerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@mutedPlayerId", playerToMute); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@mutedPlayerId", playerToMute); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -620,12 +649,12 @@ namespace HISP.Server public static bool IsRanchOwned(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -635,12 +664,12 @@ namespace HISP.Server public static void ClearItemPurchaseQueue(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM ItemPurchaseQueue WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -651,14 +680,14 @@ namespace HISP.Server { List queueItems = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM ItemPurchaseQueue WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { Item.ItemPurchaseQueueItem itm = new Item.ItemPurchaseQueueItem(); @@ -673,16 +702,16 @@ namespace HISP.Server public static void CreateDressupRoomPeice(int roomId, int peiceId, bool active, int x, int y) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO DressupRooms VALUES(@roomId, @peiceId, @active, @x, @y)"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); - sqlCommand.Parameters.AddWithValue("@peiceId", peiceId); - sqlCommand.Parameters.AddWithValue("@active", active ? "YES" : "NO"); - sqlCommand.Parameters.AddWithValue("@x", x); - sqlCommand.Parameters.AddWithValue("@y", y); + addWithValue(sqlCommand, "@roomId", roomId); + addWithValue(sqlCommand, "@peiceId", peiceId); + addWithValue(sqlCommand, "@active", active ? "YES" : "NO"); + addWithValue(sqlCommand, "@x", x); + addWithValue(sqlCommand, "@y", y); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -691,13 +720,13 @@ namespace HISP.Server public static void AddMessageToQueue(int userId, string message) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO MessageQueue VALUES(@id,@message)"; - sqlCommand.Parameters.AddWithValue("@id", userId); - sqlCommand.Parameters.AddWithValue("@message", message); + addWithValue(sqlCommand, "@id", userId); + addWithValue(sqlCommand, "@message", message); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -705,12 +734,12 @@ namespace HISP.Server } public static void ClearMessageQueue(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM MessageQueue WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -719,14 +748,14 @@ namespace HISP.Server public static string[] GetMessageQueue(int userId) { List msgQueue = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT message FROM MessageQueue WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { msgQueue.Add(reader.GetString(0)); @@ -738,14 +767,14 @@ namespace HISP.Server public static void SetDressupRoomPeiceX(int roomId, int peiceId, int newX) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE DressupRooms SET x=@x WHERE roomId=@roomId AND peiceId=@peiceId"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); - sqlCommand.Parameters.AddWithValue("@peiceId", peiceId); - sqlCommand.Parameters.AddWithValue("@x", newX); + addWithValue(sqlCommand, "@roomId", roomId); + addWithValue(sqlCommand, "@peiceId", peiceId); + addWithValue(sqlCommand, "@x", newX); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -754,14 +783,14 @@ namespace HISP.Server public static void SetDressupRoomPeiceY(int roomId, int peiceId, int newY) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE DressupRooms SET y=@y WHERE roomId=@roomId AND peiceId=@peiceId"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); - sqlCommand.Parameters.AddWithValue("@peiceId", peiceId); - sqlCommand.Parameters.AddWithValue("@y", newY); + addWithValue(sqlCommand, "@roomId", roomId); + addWithValue(sqlCommand, "@peiceId", peiceId); + addWithValue(sqlCommand, "@y", newY); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -770,14 +799,14 @@ namespace HISP.Server public static void SetDressupRoomPeiceActive(int roomId, int peiceId, bool active) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE DressupRooms SET active=@active WHERE roomId=@roomId AND peiceId=@peiceId"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); - sqlCommand.Parameters.AddWithValue("@peiceId", peiceId); - sqlCommand.Parameters.AddWithValue("@active", active ? "YES" : "NO"); + addWithValue(sqlCommand, "@roomId", roomId); + addWithValue(sqlCommand, "@peiceId", peiceId); + addWithValue(sqlCommand, "@active", active ? "YES" : "NO"); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -787,14 +816,14 @@ namespace HISP.Server public static Dressup.DressupPeice[] LoadDressupRoom(Dressup.DressupRoom room) { List peices = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM DressupRooms WHERE roomId=@roomId"; - sqlCommand.Parameters.AddWithValue("@roomId", room.RoomId); + addWithValue(sqlCommand, "@roomId", room.RoomId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { int peiceId = reader.GetInt32(1); @@ -812,14 +841,14 @@ namespace HISP.Server public static int[] GetSolvedRealTimeRiddles(int playerId) { List solvedRiddleId = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT riddleId FROM SolvedRealTimeRiddles WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { solvedRiddleId.Add(reader.GetInt32(0)); @@ -831,12 +860,12 @@ namespace HISP.Server public static int GetRanchInvestment(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT investedMoney FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int invested = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -845,13 +874,13 @@ namespace HISP.Server } public static void SetRanchUpgradeLevel(int ranchId, int upgradeLevel) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET upgradeLevel=@upgradeLevel WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@upgradeLevel", upgradeLevel); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@upgradeLevel", upgradeLevel); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -859,13 +888,13 @@ namespace HISP.Server } public static void SetRanchInvestment(int ranchId, int investedMoney) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET investedMoney=@investedMoney WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@investedMoney", investedMoney); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@investedMoney", investedMoney); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -873,13 +902,13 @@ namespace HISP.Server } public static void SetRanchOwner(int ranchId, int ownerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET playerId=@ownerId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@ownerId", ownerId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@ownerId", ownerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -887,13 +916,13 @@ namespace HISP.Server } public static void SetRanchDescription(int ranchId, string description) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET description=@description WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@description", description); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@description", description); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -901,13 +930,13 @@ namespace HISP.Server } public static void SetRanchTitle(int ranchId, string title) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET title=@title WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@title", title); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@title", title); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -915,13 +944,13 @@ namespace HISP.Server } public static void SetRanchBuilding16(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building16=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -929,13 +958,13 @@ namespace HISP.Server } public static void SetRanchBuilding15(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building15=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -943,13 +972,13 @@ namespace HISP.Server } public static void SetRanchBuilding14(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building14=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -957,13 +986,13 @@ namespace HISP.Server } public static void SetRanchBuilding13(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building13=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -971,13 +1000,13 @@ namespace HISP.Server } public static void SetRanchBuilding12(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building12=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -985,13 +1014,13 @@ namespace HISP.Server } public static void SetRanchBuilding11(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building11=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -999,13 +1028,13 @@ namespace HISP.Server } public static void SetRanchBuilding10(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building10=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1013,13 +1042,13 @@ namespace HISP.Server } public static void SetRanchBuilding9(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building9=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1027,13 +1056,13 @@ namespace HISP.Server } public static void SetRanchBuilding8(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building8=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1041,13 +1070,13 @@ namespace HISP.Server } public static void SetRanchBuilding7(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building7=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1055,13 +1084,13 @@ namespace HISP.Server } public static void SetRanchBuilding6(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building6=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1069,13 +1098,13 @@ namespace HISP.Server } public static void SetRanchBuilding5(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building5=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1083,13 +1112,13 @@ namespace HISP.Server } public static void SetRanchBuilding4(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building4=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1097,13 +1126,13 @@ namespace HISP.Server } public static void SetRanchBuilding3(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building3=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1111,13 +1140,13 @@ namespace HISP.Server } public static void SetRanchBuilding2(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building2=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1125,13 +1154,13 @@ namespace HISP.Server } public static void SetRanchBuilding1(int ranchId, int buildingId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Ranches SET building1=@buildingId WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@buildingId", buildingId); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@buildingId", buildingId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1139,12 +1168,12 @@ namespace HISP.Server } public static int GetRanchBuilding16(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building16 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1153,12 +1182,12 @@ namespace HISP.Server } public static int GetRanchBuilding15(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building15 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1167,12 +1196,12 @@ namespace HISP.Server } public static int GetRanchBuilding14(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building14 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1181,12 +1210,12 @@ namespace HISP.Server } public static int GetRanchBuilding13(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building13 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1195,12 +1224,12 @@ namespace HISP.Server } public static int GetRanchBuilding12(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building12 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1209,12 +1238,12 @@ namespace HISP.Server } public static int GetRanchBuilding11(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building11 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1223,12 +1252,12 @@ namespace HISP.Server } public static int GetRanchBuilding10(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building10 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1237,12 +1266,12 @@ namespace HISP.Server } public static int GetRanchBuilding9(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building9 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1251,12 +1280,12 @@ namespace HISP.Server } public static int GetRanchBuilding8(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building8 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1265,12 +1294,12 @@ namespace HISP.Server } public static int GetRanchBuilding7(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building7 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1279,12 +1308,12 @@ namespace HISP.Server } public static int GetRanchBuilding6(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building6 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1293,12 +1322,12 @@ namespace HISP.Server } public static int GetRanchBuilding5(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building5 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1307,12 +1336,12 @@ namespace HISP.Server } public static int GetRanchBuilding4(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building4 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1321,12 +1350,12 @@ namespace HISP.Server } public static int GetRanchBuilding3(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building3 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1335,12 +1364,12 @@ namespace HISP.Server } public static int GetRanchBuilding2(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building2 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1349,12 +1378,12 @@ namespace HISP.Server } public static int GetRanchBuilding1(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT building1 FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int building = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1363,12 +1392,12 @@ namespace HISP.Server } public static int GetRanchUpgradeLevel(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT upgradeLevel FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int upgradeLevel = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1378,12 +1407,12 @@ namespace HISP.Server public static string GetRanchDescription(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT description FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); string description = sqlCommand.ExecuteScalar().ToString(); @@ -1392,12 +1421,12 @@ namespace HISP.Server } public static string GetRanchTitle(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT title FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); string title = sqlCommand.ExecuteScalar().ToString(); @@ -1406,12 +1435,12 @@ namespace HISP.Server } public static int GetRanchOwner(int ranchId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT playerId FROM Ranches WHERE ranchId=@ranchId"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); + addWithValue(sqlCommand, "@ranchId", ranchId); sqlCommand.Prepare(); int playerId = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1421,12 +1450,12 @@ namespace HISP.Server public static int TotalRiddlesCompletedByPlayer(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM RiddlesComplete WHERE playerId=@playerId AND solved=\"YES\""; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1436,13 +1465,13 @@ namespace HISP.Server public static bool HasPlayerCompletedRealTimeRiddle(int riddleId, int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM SolvedRealTimeRiddles WHERE riddleId=@riddleId AND playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@riddleId", riddleId); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@riddleId", riddleId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1452,13 +1481,13 @@ namespace HISP.Server } public static void CompleteRealTimeRiddle(int riddleId, int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO SolvedRealTimeRiddles VALUES(@playerId, @riddleId)"; - sqlCommand.Parameters.AddWithValue("@riddleId", riddleId); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@riddleId", riddleId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1466,13 +1495,13 @@ namespace HISP.Server } public static bool HasPlayerCompletedRiddle(int riddleId, int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM RiddlesComplete WHERE riddleId=@riddleId AND playerId=@playerId AND solved=\"YES\""; - sqlCommand.Parameters.AddWithValue("@riddleId", riddleId); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@riddleId", riddleId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1481,13 +1510,13 @@ namespace HISP.Server } public static void CompleteRiddle(int riddleId, int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO RiddlesComplete VALUES(@playerId, @riddleId, \"YES\")"; - sqlCommand.Parameters.AddWithValue("@riddleId", riddleId); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@riddleId", riddleId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1496,33 +1525,33 @@ namespace HISP.Server public static void AddRanch(int ranchId, int playerId, string title, string description, int upgradeLevel, int building1, int building2, int building3, int building4, int building5, int building6, int building7, int building8, int building9, int building10, int building11, int building12, int building13, int building14, int building15, int building16, int investedMoney) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Ranches VALUES(@ranchId, @playerId, @title, @description, @upgradeLevel, @building1, @building2, @building3, @building4, @building5, @building6, @building7, @building8, @building9, @building10, @building11, @building12, @building13, @building14, @building15, @building16, @investedMoney)"; - sqlCommand.Parameters.AddWithValue("@ranchId", ranchId); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@title", title); - sqlCommand.Parameters.AddWithValue("@description", description); - sqlCommand.Parameters.AddWithValue("@upgradeLevel", upgradeLevel); - sqlCommand.Parameters.AddWithValue("@building1", building1); - sqlCommand.Parameters.AddWithValue("@building2", building2); - sqlCommand.Parameters.AddWithValue("@building3", building3); - sqlCommand.Parameters.AddWithValue("@building4", building4); - sqlCommand.Parameters.AddWithValue("@building5", building5); - sqlCommand.Parameters.AddWithValue("@building6", building6); - sqlCommand.Parameters.AddWithValue("@building7", building7); - sqlCommand.Parameters.AddWithValue("@building8", building8); - sqlCommand.Parameters.AddWithValue("@building9", building9); - sqlCommand.Parameters.AddWithValue("@building10", building10); - sqlCommand.Parameters.AddWithValue("@building11", building11); - sqlCommand.Parameters.AddWithValue("@building12", building12); - sqlCommand.Parameters.AddWithValue("@building13", building13); - sqlCommand.Parameters.AddWithValue("@building14", building14); - sqlCommand.Parameters.AddWithValue("@building15", building15); - sqlCommand.Parameters.AddWithValue("@building16", building16); - sqlCommand.Parameters.AddWithValue("@investedMoney", investedMoney); + addWithValue(sqlCommand, "@ranchId", ranchId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@title", title); + addWithValue(sqlCommand, "@description", description); + addWithValue(sqlCommand, "@upgradeLevel", upgradeLevel); + addWithValue(sqlCommand, "@building1", building1); + addWithValue(sqlCommand, "@building2", building2); + addWithValue(sqlCommand, "@building3", building3); + addWithValue(sqlCommand, "@building4", building4); + addWithValue(sqlCommand, "@building5", building5); + addWithValue(sqlCommand, "@building6", building6); + addWithValue(sqlCommand, "@building7", building7); + addWithValue(sqlCommand, "@building8", building8); + addWithValue(sqlCommand, "@building9", building9); + addWithValue(sqlCommand, "@building10", building10); + addWithValue(sqlCommand, "@building11", building11); + addWithValue(sqlCommand, "@building12", building12); + addWithValue(sqlCommand, "@building13", building13); + addWithValue(sqlCommand, "@building14", building14); + addWithValue(sqlCommand, "@building15", building15); + addWithValue(sqlCommand, "@building16", building16); + addWithValue(sqlCommand, "@investedMoney", investedMoney); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1531,13 +1560,13 @@ namespace HISP.Server } public static void SetTreasureValue(int randomId, int value) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Treasure SET value=@value WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); - sqlCommand.Parameters.AddWithValue("@value", value); + addWithValue(sqlCommand, "@randomId", randomId); + addWithValue(sqlCommand, "@value", value); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1547,12 +1576,12 @@ namespace HISP.Server public static void DeleteTreasure(int randomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Treasure WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1562,16 +1591,16 @@ namespace HISP.Server public static void AddTreasure(int randomId, int x, int y, int value, string type) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Treasure VALUES(@randomId, @x, @y, @value, @type)"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); - sqlCommand.Parameters.AddWithValue("@x", x); - sqlCommand.Parameters.AddWithValue("@y", y); - sqlCommand.Parameters.AddWithValue("@value", value); - sqlCommand.Parameters.AddWithValue("@type", type); + addWithValue(sqlCommand, "@randomId", randomId); + addWithValue(sqlCommand, "@x", x); + addWithValue(sqlCommand, "@y", y); + addWithValue(sqlCommand, "@value", value); + addWithValue(sqlCommand, "@type", type); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1581,12 +1610,12 @@ namespace HISP.Server public static Treasure[] GetTreasures() { List treasures = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Treasure"; - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { int randomId = reader.GetInt32(0); @@ -1604,14 +1633,14 @@ namespace HISP.Server public static void AddTrackedItem(int playerId, Tracking.TrackableItem what, int count) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Tracking VALUES(@playerId, @what, @count)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@what", what.ToString()); - sqlCommand.Parameters.AddWithValue("@count", count); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@what", what.ToString()); + addWithValue(sqlCommand, "@count", count); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1621,13 +1650,13 @@ namespace HISP.Server public static bool HasTrackedItem(int playerId, Tracking.TrackableItem what) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM Tracking WHERE playerId=@playerId AND what=@what"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@what", what.ToString()); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@what", what.ToString()); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1638,13 +1667,13 @@ namespace HISP.Server public static int GetTrackedCount(int playerId, Tracking.TrackableItem what) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT count FROM Tracking WHERE playerId=@playerId AND what=@what"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@what", what.ToString()); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@what", what.ToString()); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -1654,13 +1683,13 @@ namespace HISP.Server } public static void DeleteAllDroppedItemsWithId(int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM DroppedItems WHERE itemId=@itemId"; - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1670,13 +1699,13 @@ namespace HISP.Server public static void DeleteAllItemsFromUsers(int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Inventory WHERE itemId=@itemId"; - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1687,14 +1716,14 @@ namespace HISP.Server public static void SetTrackedItemCount(int playerId, Tracking.TrackableItem what, int count) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Tracking SET count=@count WHERE playerId=@playerId AND what=@what"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@what", what.ToString()); - sqlCommand.Parameters.AddWithValue("@count", count); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@what", what.ToString()); + addWithValue(sqlCommand, "@count", count); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1704,13 +1733,13 @@ namespace HISP.Server public static void AddLastPlayer(string roomId, int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO LastPlayer VALUES(@roomId,@playerId)"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@roomId", roomId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1720,38 +1749,38 @@ namespace HISP.Server public static void SetWildHorseX(int randomId, int x) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE WildHorse SET x=@x WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); - sqlCommand.Parameters.AddWithValue("@x", x); + addWithValue(sqlCommand, "@randomId", randomId); + addWithValue(sqlCommand, "@x", x); sqlCommand.ExecuteNonQuery(); } } public static void SetWildHorseTimeout(int randomId, int timeout) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE WildHorse SET timeout=@timeout WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); - sqlCommand.Parameters.AddWithValue("@timeout", timeout); + addWithValue(sqlCommand, "@randomId", randomId); + addWithValue(sqlCommand, "@timeout", timeout); sqlCommand.ExecuteNonQuery(); } } public static void RemoveWildHorse(int randomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM WildHorse WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.ExecuteNonQuery(); } @@ -1759,13 +1788,13 @@ namespace HISP.Server public static void SetWildHorseY(int randomId, int x) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE WildHorse SET y=@y WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); - sqlCommand.Parameters.AddWithValue("@y", x); + addWithValue(sqlCommand, "@randomId", randomId); + addWithValue(sqlCommand, "@y", x); sqlCommand.ExecuteNonQuery(); } @@ -1773,12 +1802,12 @@ namespace HISP.Server public static void RemoveHorse(int randomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Horses WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.ExecuteNonQuery(); } @@ -1787,71 +1816,71 @@ namespace HISP.Server public static void AddHorse(HorseInstance horse) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Horses VALUES(@randomId,@originalOwner,@leaseTime,@leaser,@breed,@name,@description,@sex,@color,@health,@shoes,@hunger,@thirst,@mood,@groom,@tiredness,@experience,@speed,@strength,@conformation,@agility,@endurance,@inteligence,@personality,@height,@saddle,@saddlepad,@bridle,@companion,@autosell,@training,@category,@spoiled,@magicused,@hidden)"; - sqlCommand.Parameters.AddWithValue("@randomId", horse.RandomId); - sqlCommand.Parameters.AddWithValue("@originalOwner", horse.Owner); - sqlCommand.Parameters.AddWithValue("@leaseTime", horse.LeaseTime); - sqlCommand.Parameters.AddWithValue("@leaser", horse.Leaser); - sqlCommand.Parameters.AddWithValue("@breed", horse.Breed.Id); - sqlCommand.Parameters.AddWithValue("@name", horse.Name); - sqlCommand.Parameters.AddWithValue("@description", horse.Description); - sqlCommand.Parameters.AddWithValue("@sex", horse.Gender); - sqlCommand.Parameters.AddWithValue("@color", horse.Color); + addWithValue(sqlCommand, "@randomId", horse.RandomId); + addWithValue(sqlCommand, "@originalOwner", horse.Owner); + addWithValue(sqlCommand, "@leaseTime", horse.LeaseTime); + addWithValue(sqlCommand, "@leaser", horse.Leaser); + addWithValue(sqlCommand, "@breed", horse.Breed.Id); + addWithValue(sqlCommand, "@name", horse.Name); + addWithValue(sqlCommand, "@description", horse.Description); + addWithValue(sqlCommand, "@sex", horse.Gender); + addWithValue(sqlCommand, "@color", horse.Color); - sqlCommand.Parameters.AddWithValue("@health", horse.BasicStats.Health); - sqlCommand.Parameters.AddWithValue("@shoes", horse.BasicStats.Shoes); - sqlCommand.Parameters.AddWithValue("@hunger", horse.BasicStats.Hunger); - sqlCommand.Parameters.AddWithValue("@thirst", horse.BasicStats.Thirst); - sqlCommand.Parameters.AddWithValue("@mood", horse.BasicStats.Mood); - sqlCommand.Parameters.AddWithValue("@groom", horse.BasicStats.Groom); - sqlCommand.Parameters.AddWithValue("@tiredness", horse.BasicStats.Tiredness); - sqlCommand.Parameters.AddWithValue("@experience", horse.BasicStats.Experience); + addWithValue(sqlCommand, "@health", horse.BasicStats.Health); + addWithValue(sqlCommand, "@shoes", horse.BasicStats.Shoes); + addWithValue(sqlCommand, "@hunger", horse.BasicStats.Hunger); + addWithValue(sqlCommand, "@thirst", horse.BasicStats.Thirst); + addWithValue(sqlCommand, "@mood", horse.BasicStats.Mood); + addWithValue(sqlCommand, "@groom", horse.BasicStats.Groom); + addWithValue(sqlCommand, "@tiredness", horse.BasicStats.Tiredness); + addWithValue(sqlCommand, "@experience", horse.BasicStats.Experience); - sqlCommand.Parameters.AddWithValue("@speed", horse.AdvancedStats.Speed); - sqlCommand.Parameters.AddWithValue("@strength", horse.AdvancedStats.Strength); - sqlCommand.Parameters.AddWithValue("@conformation", horse.AdvancedStats.Conformation); - sqlCommand.Parameters.AddWithValue("@agility", horse.AdvancedStats.Agility); - sqlCommand.Parameters.AddWithValue("@endurance", horse.AdvancedStats.Endurance); - sqlCommand.Parameters.AddWithValue("@inteligence", horse.AdvancedStats.Inteligence); - sqlCommand.Parameters.AddWithValue("@personality", horse.AdvancedStats.Personality); - sqlCommand.Parameters.AddWithValue("@height", horse.AdvancedStats.Height); + addWithValue(sqlCommand, "@speed", horse.AdvancedStats.Speed); + addWithValue(sqlCommand, "@strength", horse.AdvancedStats.Strength); + addWithValue(sqlCommand, "@conformation", horse.AdvancedStats.Conformation); + addWithValue(sqlCommand, "@agility", horse.AdvancedStats.Agility); + addWithValue(sqlCommand, "@endurance", horse.AdvancedStats.Endurance); + addWithValue(sqlCommand, "@inteligence", horse.AdvancedStats.Inteligence); + addWithValue(sqlCommand, "@personality", horse.AdvancedStats.Personality); + addWithValue(sqlCommand, "@height", horse.AdvancedStats.Height); if (horse.Equipment.Saddle != null) - sqlCommand.Parameters.AddWithValue("@saddle", horse.Equipment.Saddle.Id); + addWithValue(sqlCommand, "@saddle", horse.Equipment.Saddle.Id); else - sqlCommand.Parameters.AddWithValue("@saddle", null); + addWithValue(sqlCommand, "@saddle", null); if (horse.Equipment.SaddlePad != null) - sqlCommand.Parameters.AddWithValue("@saddlepad", horse.Equipment.SaddlePad.Id); + addWithValue(sqlCommand, "@saddlepad", horse.Equipment.SaddlePad.Id); else - sqlCommand.Parameters.AddWithValue("@saddlepad", null); + addWithValue(sqlCommand, "@saddlepad", null); if (horse.Equipment.Bridle != null) - sqlCommand.Parameters.AddWithValue("@bridle", horse.Equipment.Bridle.Id); + addWithValue(sqlCommand, "@bridle", horse.Equipment.Bridle.Id); else - sqlCommand.Parameters.AddWithValue("@bridle", null); + addWithValue(sqlCommand, "@bridle", null); if (horse.Equipment.Companion != null) - sqlCommand.Parameters.AddWithValue("@companion", horse.Equipment.Companion.Id); + addWithValue(sqlCommand, "@companion", horse.Equipment.Companion.Id); else - sqlCommand.Parameters.AddWithValue("@companion", null); + addWithValue(sqlCommand, "@companion", null); - sqlCommand.Parameters.AddWithValue("@autosell", horse.AutoSell); - sqlCommand.Parameters.AddWithValue("@training", horse.TrainTimer); - sqlCommand.Parameters.AddWithValue("@category", horse.Category); - sqlCommand.Parameters.AddWithValue("@spoiled", horse.Spoiled); - sqlCommand.Parameters.AddWithValue("@magicused", horse.MagicUsed); + addWithValue(sqlCommand, "@autosell", horse.AutoSell); + addWithValue(sqlCommand, "@training", horse.TrainTimer); + addWithValue(sqlCommand, "@category", horse.Category); + addWithValue(sqlCommand, "@spoiled", horse.Spoiled); + addWithValue(sqlCommand, "@magicused", horse.MagicUsed); - sqlCommand.Parameters.AddWithValue("@hidden", horse.Hidden ? "YES" : "NO"); + addWithValue(sqlCommand, "@hidden", horse.Hidden ? "YES" : "NO"); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1861,7 +1890,7 @@ namespace HISP.Server } - public static HorseInstance ReadHorseInstance(MySqlDataReader reader) + public static HorseInstance ReadHorseInstance(DbDataReader reader) { int randomId = reader.GetInt32(0); int breedId = reader.GetInt32(4); @@ -1921,14 +1950,14 @@ namespace HISP.Server public static void LoadHorseInventory(HorseInventory inv, int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Horses WHERE ownerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { @@ -1941,14 +1970,14 @@ namespace HISP.Server public static void LoadAuctionRoom(Auction auction, int roomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Auctions WHERE roomId=@roomId"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); + addWithValue(sqlCommand, "@roomId", roomId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { @@ -1974,12 +2003,12 @@ namespace HISP.Server public static void DeleteAuctionRoom(int randomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Auctions WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -1987,19 +2016,19 @@ namespace HISP.Server } public static void AddAuctionRoom(Auction.AuctionEntry entry, int roomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Auctions VALUES(@roomId, @randomId, @horseRandomId, @ownerId, @timeRemaining, @highestBid, @highestBidder, @done)"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); - sqlCommand.Parameters.AddWithValue("@randomId", entry.RandomId); - sqlCommand.Parameters.AddWithValue("@horseRandomId", entry.Horse.RandomId); - sqlCommand.Parameters.AddWithValue("@ownerId", entry.OwnerId); - sqlCommand.Parameters.AddWithValue("@timeRemaining", entry.TimeRemaining); - sqlCommand.Parameters.AddWithValue("@highestBid", entry.HighestBid); - sqlCommand.Parameters.AddWithValue("@highestBidder", entry.HighestBidder); - sqlCommand.Parameters.AddWithValue("@done", entry.Completed ? "YES" : "NO"); + addWithValue(sqlCommand, "@roomId", roomId); + addWithValue(sqlCommand, "@randomId", entry.RandomId); + addWithValue(sqlCommand, "@horseRandomId", entry.Horse.RandomId); + addWithValue(sqlCommand, "@ownerId", entry.OwnerId); + addWithValue(sqlCommand, "@timeRemaining", entry.TimeRemaining); + addWithValue(sqlCommand, "@highestBid", entry.HighestBid); + addWithValue(sqlCommand, "@highestBidder", entry.HighestBidder); + addWithValue(sqlCommand, "@done", entry.Completed ? "YES" : "NO"); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2008,14 +2037,14 @@ namespace HISP.Server public static void BanUser(int userId, string ip, string reason) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO BannedPlayers VALUES(@playerId,@ipAddress,@reason)"; - sqlCommand.Parameters.AddWithValue("@playerId", userId); - sqlCommand.Parameters.AddWithValue("@ipAddress", ip); - sqlCommand.Parameters.AddWithValue("@reason", reason); + addWithValue(sqlCommand, "@playerId", userId); + addWithValue(sqlCommand, "@ipAddress", ip); + addWithValue(sqlCommand, "@reason", reason); sqlCommand.ExecuteNonQuery(); } @@ -2023,12 +2052,12 @@ namespace HISP.Server public static void UnBanUser(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM BannedPlayers WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", userId); + addWithValue(sqlCommand, "@playerId", userId); sqlCommand.ExecuteNonQuery(); } @@ -2037,12 +2066,12 @@ namespace HISP.Server public static bool IsIpBanned(string ip) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM BannedPlayers WHERE ipAddress=@ipAddr"; - sqlCommand.Parameters.AddWithValue("@ipAddr", ip); + addWithValue(sqlCommand, "@ipAddr", ip); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); return count >= 1; @@ -2050,12 +2079,12 @@ namespace HISP.Server } public static bool IsUserBanned(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM BannedPlayers WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", userId); + addWithValue(sqlCommand, "@playerId", userId); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); return count >= 1; @@ -2066,70 +2095,70 @@ namespace HISP.Server public static void AddWildHorse(WildHorse horse) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO WildHorse VALUES(@randomId,@originalOwner,@breed,@x,@y,@name,@description,@sex,@color,@health,@shoes,@hunger,@thirst,@mood,@groom,@tiredness,@experience,@speed,@strength,@conformation,@agility,@endurance,@inteligence,@personality,@height,@saddle,@saddlepad,@bridle,@companion,@timeout,@autosell,@training,@category,@spoiled,@magicused)"; - sqlCommand.Parameters.AddWithValue("@randomId", horse.Instance.RandomId); - sqlCommand.Parameters.AddWithValue("@originalOwner", horse.Instance.Owner); - sqlCommand.Parameters.AddWithValue("@breed", horse.Instance.Breed.Id); - sqlCommand.Parameters.AddWithValue("@x", horse.X); - sqlCommand.Parameters.AddWithValue("@y", horse.Y); - sqlCommand.Parameters.AddWithValue("@name", horse.Instance.Name); - sqlCommand.Parameters.AddWithValue("@description", horse.Instance.Description); - sqlCommand.Parameters.AddWithValue("@sex", horse.Instance.Gender); - sqlCommand.Parameters.AddWithValue("@color", horse.Instance.Color); + addWithValue(sqlCommand, "@randomId", horse.Instance.RandomId); + addWithValue(sqlCommand, "@originalOwner", horse.Instance.Owner); + addWithValue(sqlCommand, "@breed", horse.Instance.Breed.Id); + addWithValue(sqlCommand, "@x", horse.X); + addWithValue(sqlCommand, "@y", horse.Y); + addWithValue(sqlCommand, "@name", horse.Instance.Name); + addWithValue(sqlCommand, "@description", horse.Instance.Description); + addWithValue(sqlCommand, "@sex", horse.Instance.Gender); + addWithValue(sqlCommand, "@color", horse.Instance.Color); - sqlCommand.Parameters.AddWithValue("@health", horse.Instance.BasicStats.Health); - sqlCommand.Parameters.AddWithValue("@shoes", horse.Instance.BasicStats.Shoes); - sqlCommand.Parameters.AddWithValue("@hunger", horse.Instance.BasicStats.Hunger); - sqlCommand.Parameters.AddWithValue("@thirst", horse.Instance.BasicStats.Thirst); - sqlCommand.Parameters.AddWithValue("@mood", horse.Instance.BasicStats.Mood); - sqlCommand.Parameters.AddWithValue("@groom", horse.Instance.BasicStats.Groom); - sqlCommand.Parameters.AddWithValue("@tiredness", horse.Instance.BasicStats.Tiredness); - sqlCommand.Parameters.AddWithValue("@experience", horse.Instance.BasicStats.Experience); + addWithValue(sqlCommand, "@health", horse.Instance.BasicStats.Health); + addWithValue(sqlCommand, "@shoes", horse.Instance.BasicStats.Shoes); + addWithValue(sqlCommand, "@hunger", horse.Instance.BasicStats.Hunger); + addWithValue(sqlCommand, "@thirst", horse.Instance.BasicStats.Thirst); + addWithValue(sqlCommand, "@mood", horse.Instance.BasicStats.Mood); + addWithValue(sqlCommand, "@groom", horse.Instance.BasicStats.Groom); + addWithValue(sqlCommand, "@tiredness", horse.Instance.BasicStats.Tiredness); + addWithValue(sqlCommand, "@experience", horse.Instance.BasicStats.Experience); - sqlCommand.Parameters.AddWithValue("@speed", horse.Instance.AdvancedStats.Speed); - sqlCommand.Parameters.AddWithValue("@strength", horse.Instance.AdvancedStats.Strength); - sqlCommand.Parameters.AddWithValue("@conformation", horse.Instance.AdvancedStats.Conformation); - sqlCommand.Parameters.AddWithValue("@agility", horse.Instance.AdvancedStats.Agility); - sqlCommand.Parameters.AddWithValue("@endurance", horse.Instance.AdvancedStats.Endurance); - sqlCommand.Parameters.AddWithValue("@inteligence", horse.Instance.AdvancedStats.Inteligence); - sqlCommand.Parameters.AddWithValue("@personality", horse.Instance.AdvancedStats.Personality); - sqlCommand.Parameters.AddWithValue("@height", horse.Instance.AdvancedStats.Height); + addWithValue(sqlCommand, "@speed", horse.Instance.AdvancedStats.Speed); + addWithValue(sqlCommand, "@strength", horse.Instance.AdvancedStats.Strength); + addWithValue(sqlCommand, "@conformation", horse.Instance.AdvancedStats.Conformation); + addWithValue(sqlCommand, "@agility", horse.Instance.AdvancedStats.Agility); + addWithValue(sqlCommand, "@endurance", horse.Instance.AdvancedStats.Endurance); + addWithValue(sqlCommand, "@inteligence", horse.Instance.AdvancedStats.Inteligence); + addWithValue(sqlCommand, "@personality", horse.Instance.AdvancedStats.Personality); + addWithValue(sqlCommand, "@height", horse.Instance.AdvancedStats.Height); if (horse.Instance.Equipment.Saddle != null) - sqlCommand.Parameters.AddWithValue("@saddle", horse.Instance.Equipment.Saddle.Id); + addWithValue(sqlCommand, "@saddle", horse.Instance.Equipment.Saddle.Id); else - sqlCommand.Parameters.AddWithValue("@saddle", null); + addWithValue(sqlCommand, "@saddle", null); if (horse.Instance.Equipment.SaddlePad != null) - sqlCommand.Parameters.AddWithValue("@saddlepad", horse.Instance.Equipment.SaddlePad.Id); + addWithValue(sqlCommand, "@saddlepad", horse.Instance.Equipment.SaddlePad.Id); else - sqlCommand.Parameters.AddWithValue("@saddlepad", null); + addWithValue(sqlCommand, "@saddlepad", null); if (horse.Instance.Equipment.Bridle != null) - sqlCommand.Parameters.AddWithValue("@bridle", horse.Instance.Equipment.Bridle.Id); + addWithValue(sqlCommand, "@bridle", horse.Instance.Equipment.Bridle.Id); else - sqlCommand.Parameters.AddWithValue("@bridle", null); + addWithValue(sqlCommand, "@bridle", null); if (horse.Instance.Equipment.Companion != null) - sqlCommand.Parameters.AddWithValue("@companion", horse.Instance.Equipment.Companion.Id); + addWithValue(sqlCommand, "@companion", horse.Instance.Equipment.Companion.Id); else - sqlCommand.Parameters.AddWithValue("@companion", null); + addWithValue(sqlCommand, "@companion", null); - sqlCommand.Parameters.AddWithValue("@timeout", horse.Timeout); - sqlCommand.Parameters.AddWithValue("@autosell", horse.Instance.AutoSell); - sqlCommand.Parameters.AddWithValue("@training", horse.Instance.TrainTimer); - sqlCommand.Parameters.AddWithValue("@category", horse.Instance.Category); - sqlCommand.Parameters.AddWithValue("@spoiled", horse.Instance.Spoiled); - sqlCommand.Parameters.AddWithValue("@magicused", horse.Instance.MagicUsed); + addWithValue(sqlCommand, "@timeout", horse.Timeout); + addWithValue(sqlCommand, "@autosell", horse.Instance.AutoSell); + addWithValue(sqlCommand, "@training", horse.Instance.TrainTimer); + addWithValue(sqlCommand, "@category", horse.Instance.Category); + addWithValue(sqlCommand, "@spoiled", horse.Instance.Spoiled); + addWithValue(sqlCommand, "@magicused", horse.Instance.MagicUsed); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2142,15 +2171,15 @@ namespace HISP.Server public static void LoadWildHorses() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM WildHorse"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { @@ -2210,12 +2239,12 @@ namespace HISP.Server public static bool LastPlayerExist(string roomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM LastPlayer WHERE roomId=@roomId"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); + addWithValue(sqlCommand, "@roomId", roomId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2229,12 +2258,12 @@ namespace HISP.Server if (!Database.LastPlayerExist(roomId)) Database.AddLastPlayer(roomId, -1); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT playerId FROM LastPlayer WHERE roomId=@roomId"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); + addWithValue(sqlCommand, "@roomId", roomId); sqlCommand.Prepare(); int playerId = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2248,13 +2277,13 @@ namespace HISP.Server { if (!Database.LastPlayerExist(roomId)) Database.AddLastPlayer(roomId, -1); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE LastPlayer SET playerId=@playerId WHERE roomId=@roomId"; - sqlCommand.Parameters.AddWithValue("@roomId", roomId); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@roomId", roomId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2264,15 +2293,15 @@ namespace HISP.Server public static void AddPoetWord(int id, int x, int y, int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO PoetryRooms VALUES(@id,@x,@y,@room)"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@x", x); - sqlCommand.Parameters.AddWithValue("@y", y); - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@x", x); + addWithValue(sqlCommand, "@y", y); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2282,15 +2311,15 @@ namespace HISP.Server public static void SetPoetPosition(int id, int x, int y, int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE PoetryRooms SET X=@x, Y=@y WHERE poetId=@id AND roomId=@room"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@x", x); - sqlCommand.Parameters.AddWithValue("@y", y); - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@x", x); + addWithValue(sqlCommand, "@y", y); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2300,13 +2329,13 @@ namespace HISP.Server public static bool GetPoetExist(int id, int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM PoetryRooms WHERE poetId=@id AND roomId=@room"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2316,13 +2345,13 @@ namespace HISP.Server } public static int GetPoetPositionX(int id, int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT X FROM PoetryRooms WHERE poetId=@id AND roomId=@room"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); int xpos = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2333,13 +2362,13 @@ namespace HISP.Server public static int GetPoetPositionY(int id, int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Y FROM PoetryRooms WHERE poetId=@id AND roomId=@room"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); int ypos = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2350,12 +2379,12 @@ namespace HISP.Server public static bool SavedDrawingsExist(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM SavedDrawings WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2365,12 +2394,12 @@ namespace HISP.Server } public static void CreateSavedDrawings(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO SavedDrawings VALUES(@playerId,'','','')"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2380,12 +2409,12 @@ namespace HISP.Server public static bool DrawingRoomExists(int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM DrawingRooms WHERE roomId=@room"; - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2396,12 +2425,12 @@ namespace HISP.Server public static void CreateDrawingRoom(int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO DrawingRooms VALUES(@roomId,'')"; - sqlCommand.Parameters.AddWithValue("@roomId", room); + addWithValue(sqlCommand, "@roomId", room); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2411,13 +2440,13 @@ namespace HISP.Server public static void SetDrawingRoomDrawing(int room, string Drawing) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE DrawingRooms SET Drawing=@drawing WHERE roomId=@room"; - sqlCommand.Parameters.AddWithValue("@drawing", Drawing); - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@drawing", Drawing); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2426,12 +2455,12 @@ namespace HISP.Server } public static string GetDrawingRoomDrawing(int room) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Drawing FROM DrawingRooms WHERE roomId=@room"; - sqlCommand.Parameters.AddWithValue("@room", room); + addWithValue(sqlCommand, "@room", room); sqlCommand.Prepare(); string drawing = sqlCommand.ExecuteScalar().ToString(); @@ -2444,12 +2473,12 @@ namespace HISP.Server if (!SavedDrawingsExist(playerId)) CreateSavedDrawings(playerId); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Drawing3 FROM SavedDrawings WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); string drawing = sqlCommand.ExecuteScalar().ToString(); @@ -2462,12 +2491,12 @@ namespace HISP.Server if (!SavedDrawingsExist(playerId)) CreateSavedDrawings(playerId); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Drawing2 FROM SavedDrawings WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); string drawing = sqlCommand.ExecuteScalar().ToString(); @@ -2480,12 +2509,12 @@ namespace HISP.Server if (!SavedDrawingsExist(playerId)) CreateSavedDrawings(playerId); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Drawing1 FROM SavedDrawings WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); string drawing = sqlCommand.ExecuteScalar().ToString(); @@ -2498,13 +2527,13 @@ namespace HISP.Server if (!SavedDrawingsExist(playerId)) CreateSavedDrawings(playerId); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE SavedDrawings SET Drawing1=@drawing WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@drawing", drawing); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@drawing", drawing); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2516,13 +2545,13 @@ namespace HISP.Server { if (!SavedDrawingsExist(playerId)) CreateSavedDrawings(playerId); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE SavedDrawings SET Drawing2=@drawing WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@drawing", drawing); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@drawing", drawing); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2534,13 +2563,13 @@ namespace HISP.Server { if (!SavedDrawingsExist(playerId)) CreateSavedDrawings(playerId); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE SavedDrawings SET Drawing3=@drawing WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@drawing", drawing); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@drawing", drawing); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2550,12 +2579,12 @@ namespace HISP.Server public static void SetStartTime(int startTime) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE World SET StartTime=@startTimer"; - sqlCommand.Parameters.AddWithValue("@startTimer", startTime); + addWithValue(sqlCommand, "@startTimer", startTime); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2564,14 +2593,14 @@ namespace HISP.Server public static void SetServerTime(int time, int day, int year) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE World SET Time=@time,Day=@day,Year=@year"; - sqlCommand.Parameters.AddWithValue("@time", time); - sqlCommand.Parameters.AddWithValue("@day", day); - sqlCommand.Parameters.AddWithValue("@year", year); + addWithValue(sqlCommand, "@time", time); + addWithValue(sqlCommand, "@day", day); + addWithValue(sqlCommand, "@year", year); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2580,10 +2609,10 @@ namespace HISP.Server public static int GetServerTime() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Time FROM World"; int serverTime = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2593,10 +2622,10 @@ namespace HISP.Server public static int GetServerStartTime() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT StartTime FROM World"; int startTime = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2606,10 +2635,10 @@ namespace HISP.Server public static int GetServerDay() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Day FROM World"; int serverTime = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2619,10 +2648,10 @@ namespace HISP.Server public static int GetServerYear() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Year FROM World"; int creationTime = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2635,12 +2664,12 @@ namespace HISP.Server public static bool WeatherExists(string Area) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM Weather WHERE Area=@area"; - sqlCommand.Parameters.AddWithValue("@area", Area); + addWithValue(sqlCommand, "@area", Area); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); return count > 0; @@ -2649,26 +2678,26 @@ namespace HISP.Server public static void InsertWeather(string Area, string Weather) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Weather VALUES(@area,@weather)"; - sqlCommand.Parameters.AddWithValue("@weather", Weather); - sqlCommand.Parameters.AddWithValue("@area", Area); + addWithValue(sqlCommand, "@weather", Weather); + addWithValue(sqlCommand, "@area", Area); sqlCommand.ExecuteNonQuery(); } } public static void SetWeather(string Area, string Weather) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Weather SET Weather=@weather WHERE Area=@area"; - sqlCommand.Parameters.AddWithValue("@weather", Weather); - sqlCommand.Parameters.AddWithValue("@area", Area); + addWithValue(sqlCommand, "@weather", Weather); + addWithValue(sqlCommand, "@area", Area); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2677,12 +2706,12 @@ namespace HISP.Server } public static string GetWeather(string Area) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Weather FROM Weather WHERE Area=@area"; - sqlCommand.Parameters.AddWithValue("@area", Area); + addWithValue(sqlCommand, "@area", Area); string Weather = sqlCommand.ExecuteScalar().ToString(); return Weather; @@ -2691,10 +2720,10 @@ namespace HISP.Server public static void DecHorseTrainTimeout() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET trainTimer=trainTimer-1 WHERE trainTimer-1 > -1"; sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2707,15 +2736,15 @@ namespace HISP.Server { List instances = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Horses WHERE ownerId=@playerId AND category=@category"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@category", category); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@category", category); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { instances.Add(ReadHorseInstance(reader)); @@ -2728,14 +2757,14 @@ namespace HISP.Server public static HorseInstance GetPlayerHorse(int horseRandomId) { HorseInstance instance = null; - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Horses WHERE randomId=@horseRandomId"; - sqlCommand.Parameters.AddWithValue("@horseRandomId", horseRandomId); + addWithValue(sqlCommand, "@horseRandomId", horseRandomId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { instance = ReadHorseInstance(reader); @@ -2751,12 +2780,12 @@ namespace HISP.Server public static int GetHorseTrainTimeout(int horseRandomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT trainTimer FROM Horses WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); int trainTimer = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -2766,13 +2795,13 @@ namespace HISP.Server public static void SetAuctionDone(int randomId, bool done) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Auctions SET done=@done WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@done", done ? "YES" : "NO"); - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@done", done ? "YES" : "NO"); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2781,13 +2810,13 @@ namespace HISP.Server public static void SetAuctionTimeout(int randomId, int timeRemaining) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Auctions SET timeRemaining=@timeRemaining WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@timeRemaining", timeRemaining); - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@timeRemaining", timeRemaining); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2796,13 +2825,13 @@ namespace HISP.Server public static void SetAuctionHighestBid(int randomId, int highestBid) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Auctions SET highestBid=@highestBid WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@highestBid", highestBid); - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@highestBid", highestBid); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2811,13 +2840,13 @@ namespace HISP.Server public static void SetAuctionHighestBidder(int randomId, int highestBidder) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Auctions SET highestBidder=@highestBidder WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@highestBidder", highestBidder); - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@highestBidder", highestBidder); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2827,13 +2856,13 @@ namespace HISP.Server public static void SetHorseOwner(int randomId, int owner) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET ownerId=@owner WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@owner", owner); - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@owner", owner); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2842,13 +2871,13 @@ namespace HISP.Server public static void SetHorseHidden(int randomId, bool hidden) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET hidden=@hidden WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@hidden", hidden ? "YES" : "NO"); - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@hidden", hidden ? "YES" : "NO"); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2856,13 +2885,13 @@ namespace HISP.Server } public static void SetHorseTrainTimeout(int horseRandomId, int trainTimeout) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET trainTimer=@trainTimer WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@trainTimer", trainTimeout); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@trainTimer", trainTimeout); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2870,13 +2899,13 @@ namespace HISP.Server } public static void SetHorseColor(int horseRandomId, string Color) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET color=@color WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@color", Color); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@color", Color); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2884,13 +2913,13 @@ namespace HISP.Server } public static void SetHorseCategory(int horseRandomId, string Category) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET category=@category WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@category", Category); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@category", Category); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2899,13 +2928,13 @@ namespace HISP.Server public static void SetHorseAutoSell(int horseRandomId, int AutoSell) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET autosell=@autosell WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@autosell", AutoSell); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@autosell", AutoSell); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2913,13 +2942,13 @@ namespace HISP.Server } public static void SetHorseMagicUsed(int horseRandomId, int MagicUsed) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET magicused=@magicused WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@magicused", MagicUsed); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@magicused", MagicUsed); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2927,13 +2956,13 @@ namespace HISP.Server } public static void SetLeaseTime(int horseRandomId, int leaseTime) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET leaseTime=@leaseTime WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@leaseTime", leaseTime); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@leaseTime", leaseTime); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2942,13 +2971,13 @@ namespace HISP.Server public static void SetHorseName(int horseRandomId, string Name) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET name=@name WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@name", Name); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@name", Name); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2956,13 +2985,13 @@ namespace HISP.Server } public static void SetHorseDescription(int horseRandomId, string Description) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET description=@description WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@description", Description); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@description", Description); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2970,13 +2999,13 @@ namespace HISP.Server } public static void SetHorseTiredness(int horseRandomId, int Tiredness) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET tiredness=@tiredness WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@tiredness", Tiredness); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@tiredness", Tiredness); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2984,13 +3013,13 @@ namespace HISP.Server } public static void SetHorseSpeed(int horseRandomId, int Speed) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET speed=@speed WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@speed", Speed); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@speed", Speed); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -2998,13 +3027,13 @@ namespace HISP.Server } public static void SetHorseStrength(int horseRandomId, int Strength) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET strength=@strength WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@strength", Strength); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@strength", Strength); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3012,13 +3041,13 @@ namespace HISP.Server } public static void SetHorseConformation(int horseRandomId, int Conformation) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET conformation=@conformation WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@conformation", Conformation); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@conformation", Conformation); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3026,13 +3055,13 @@ namespace HISP.Server } public static void SetHorseAgility(int horseRandomId, int Agility) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET agility=@agility WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@agility", Agility); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@agility", Agility); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3040,13 +3069,13 @@ namespace HISP.Server } public static void SetHorseEndurance(int horseRandomId, int Endurance) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET endurance=@endurance WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@endurance", Endurance); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@endurance", Endurance); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3054,13 +3083,13 @@ namespace HISP.Server } public static void SetHorsePersonality(int horseRandomId, int Personality) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET personality=@personality WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@personality", Personality); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@personality", Personality); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3068,13 +3097,13 @@ namespace HISP.Server } public static void SetHorseInteligence(int horseRandomId, int Inteligence) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET inteligence=@inteligence WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@inteligence", Inteligence); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@inteligence", Inteligence); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3082,13 +3111,13 @@ namespace HISP.Server } public static void SetHorseSpoiled(int horseRandomId, int Spoiled) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET spoiled=@spoiled WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@spoiled", Spoiled); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@spoiled", Spoiled); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3096,13 +3125,13 @@ namespace HISP.Server } public static void SetHorseExperience(int horseRandomId, int Experience) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET experience=@experience WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@experience", Experience); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@experience", Experience); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3110,13 +3139,13 @@ namespace HISP.Server } public static void SetHorseShoes(int horseRandomId, int Shoes) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET shoes=@shoes WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@shoes", Shoes); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@shoes", Shoes); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3124,13 +3153,13 @@ namespace HISP.Server } public static void SetHorseHeight(int horseRandomId, int Height) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET height=@height WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@height", Height); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@height", Height); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3138,13 +3167,13 @@ namespace HISP.Server } public static void SetHorseMood(int horseRandomId, int Mood) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET mood=@mood WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@mood", Mood); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@mood", Mood); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3152,13 +3181,13 @@ namespace HISP.Server } public static void SetHorseGroom(int horseRandomId, int Groom) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET groom=@groom WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@groom", Groom); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@groom", Groom); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3167,13 +3196,13 @@ namespace HISP.Server public static void SetHorseHunger(int horseRandomId, int Hunger) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET hunger=@hunger WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@hunger", Hunger); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@hunger", Hunger); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3181,13 +3210,13 @@ namespace HISP.Server } public static void SetHorseThirst(int horseRandomId, int Thirst) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET thirst=@thirst WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@thirst", Thirst); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@thirst", Thirst); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3195,13 +3224,13 @@ namespace HISP.Server } public static void SetHorseHealth(int horseRandomId, int Health) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET health=@health WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@health", Health); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@health", Health); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3210,13 +3239,13 @@ namespace HISP.Server public static void SetSaddle(int horseRandomId, int saddleItemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET saddle=@saddle WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@saddle", saddleItemId); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@saddle", saddleItemId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3225,13 +3254,13 @@ namespace HISP.Server public static void SetSaddlePad(int horseRandomId, int saddlePadItemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET saddlepad=@saddlepad WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@saddlepad", saddlePadItemId); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@saddlepad", saddlePadItemId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3240,13 +3269,13 @@ namespace HISP.Server public static void SetBridle(int horseRandomId, int bridleItemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET bridle=@bridle WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@bridle", bridleItemId); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@bridle", bridleItemId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3254,13 +3283,13 @@ namespace HISP.Server } public static void SetCompanion(int horseRandomId, int companionItemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET companion=@companion WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@companion", companionItemId); - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@companion", companionItemId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3269,12 +3298,12 @@ namespace HISP.Server public static void ClearSaddle(int horseRandomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET saddle=NULL WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3283,12 +3312,12 @@ namespace HISP.Server public static void ClearSaddlePad(int horseRandomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET saddlepad=NULL WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3297,12 +3326,12 @@ namespace HISP.Server public static void ClearBridle(int horseRandomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET bridle=NULL WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3311,12 +3340,12 @@ namespace HISP.Server public static void ClearCompanion(int horseRandomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET companion=NULL WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", horseRandomId); + addWithValue(sqlCommand, "@randomId", horseRandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3325,11 +3354,11 @@ namespace HISP.Server public static void SetWorldWeather(string Weather) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE World SET Weather=@weather"; - sqlCommand.Parameters.AddWithValue("@weather", Weather); + addWithValue(sqlCommand, "@weather", Weather); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3338,14 +3367,14 @@ namespace HISP.Server public static byte[] GetPasswordSalt(string username) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(username)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Salt FROM Users WHERE Username=@name"; - sqlCommand.Parameters.AddWithValue("@name", username); + addWithValue(sqlCommand, "@name", username); sqlCommand.Prepare(); string expectedHash = sqlCommand.ExecuteScalar().ToString(); @@ -3360,13 +3389,13 @@ namespace HISP.Server public static bool HasJewelry(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM Jewelry WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3377,13 +3406,13 @@ namespace HISP.Server public static void InitJewelry(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Jewelry VALUES(@playerId,0,0,0,0)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3395,14 +3424,14 @@ namespace HISP.Server public static void SetJewelrySlot1(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Jewelry SET slot1=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3411,13 +3440,13 @@ namespace HISP.Server } public static int GetJewelrySlot1(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT slot1 FROM Jewelry WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3427,14 +3456,14 @@ namespace HISP.Server public static void SetJewelrySlot2(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Jewelry SET slot2=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3443,13 +3472,13 @@ namespace HISP.Server } public static int GetJewelrySlot2(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT slot2 FROM Jewelry WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3460,14 +3489,14 @@ namespace HISP.Server public static void SetJewelrySlot3(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Jewelry SET slot3=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3476,13 +3505,13 @@ namespace HISP.Server } public static int GetJewelrySlot3(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT slot3 FROM Jewelry WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3492,14 +3521,14 @@ namespace HISP.Server public static void SetJewelrySlot4(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Jewelry SET slot4=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3508,13 +3537,13 @@ namespace HISP.Server } public static int GetJewelrySlot4(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT slot4 FROM Jewelry WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3527,16 +3556,16 @@ namespace HISP.Server public static int[] GetAwards(int playerId) { List Awards = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT awardId FROM Awards WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { Awards.Add(reader.GetInt32(0)); @@ -3547,14 +3576,14 @@ namespace HISP.Server } public static void AddAward(int playerId, int awardId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Awards VALUES(@playerId,@awardId)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@awardId", awardId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@awardId", awardId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3566,13 +3595,13 @@ namespace HISP.Server public static bool HasCompetitionGear(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM CompetitionGear WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3583,13 +3612,13 @@ namespace HISP.Server public static void InitCompetitionGear(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO CompetitionGear VALUES(@playerId,0,0,0,0)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3599,14 +3628,14 @@ namespace HISP.Server public static void SetCompetitionGearHeadPeice(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE CompetitionGear SET headItem=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3615,13 +3644,13 @@ namespace HISP.Server } public static int GetCompetitionGearHeadPeice(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT headItem FROM CompetitionGear WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3631,14 +3660,14 @@ namespace HISP.Server public static void SetCompetitionGearBodyPeice(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE CompetitionGear SET bodyItem=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3647,13 +3676,13 @@ namespace HISP.Server } public static int GetCompetitionGearBodyPeice(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT bodyItem FROM CompetitionGear WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3663,14 +3692,14 @@ namespace HISP.Server public static void SetCompetitionGearLegPeice(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE CompetitionGear SET legItem=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3679,13 +3708,13 @@ namespace HISP.Server } public static int GetCompetitionGearLegPeice(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT legItem FROM CompetitionGear WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3695,14 +3724,14 @@ namespace HISP.Server public static void SetCompetitionGearFeetPeice(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE CompetitionGear SET feetItem=@itemId WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3711,13 +3740,13 @@ namespace HISP.Server } public static int GetCompetitionGearFeetPeice(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT feetItem FROM CompetitionGear WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3730,14 +3759,14 @@ namespace HISP.Server if(CheckTrackeQuestExists(playerId,questId)) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT timesCompleted FROM TrackedQuest WHERE playerId=@playerId AND questId=@questId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@questId", questId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@questId", questId); sqlCommand.Prepare(); int timesComplete = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3752,14 +3781,14 @@ namespace HISP.Server } public static bool CheckTrackeQuestExists(int playerId, int questId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(*) FROM TrackedQuest WHERE playerId=@playerId AND questId=@questId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@questId", questId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@questId", questId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3775,15 +3804,15 @@ namespace HISP.Server public static TrackedQuest[] GetTrackedQuests(int playerId) { List TrackedQuests = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT questId,timesCompleted FROM TrackedQuest WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { TrackedQuest TrackedQuest = new TrackedQuest(playerId, reader.GetInt32(0), reader.GetInt32(1)); @@ -3797,15 +3826,15 @@ namespace HISP.Server { if(CheckTrackeQuestExists(playerId,questId)) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE TrackedQuest SET timesCompleted=@timesCompleted WHERE playerId=@playerId AND questId=@questId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@questId", questId); - sqlCommand.Parameters.AddWithValue("@timesCompleted", timesCompleted); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@questId", questId); + addWithValue(sqlCommand, "@timesCompleted", timesCompleted); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3819,14 +3848,14 @@ namespace HISP.Server } public static bool SetUserSubscriptionStatus(int playerId, bool subscribed) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET Subscriber=@subscribed WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@subscribed", subscribed ? "YES" : "NO"); - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@subscribed", subscribed ? "YES" : "NO"); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3837,13 +3866,13 @@ namespace HISP.Server } public static string GetGender(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Gender FROM Users WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); string gender = sqlCommand.ExecuteScalar().ToString(); @@ -3853,13 +3882,13 @@ namespace HISP.Server } public static int GetLoginCount(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT TotalLogins FROM UserExt WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3869,14 +3898,14 @@ namespace HISP.Server } public static void SetLoginCount(int playerId, int count) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET TotalLogins=@count WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@count", count); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@count", count); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3884,13 +3913,13 @@ namespace HISP.Server } public static int GetExperience(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Experience FROM UserExt WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int xp = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3900,14 +3929,14 @@ namespace HISP.Server } public static void SetExperience(int playerId, int exp) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET Experience=@xp WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@xp", exp); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@xp", exp); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3915,13 +3944,13 @@ namespace HISP.Server } public static void IncAllUsersFreeTime(int minutes) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET FreeMinutes=FreeMinutes+@minutes"; - sqlCommand.Parameters.AddWithValue("@minutes", minutes); + addWithValue(sqlCommand, "@minutes", minutes); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3929,14 +3958,14 @@ namespace HISP.Server } public static void SetFreeTime(int playerId, int minutes) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET FreeMinutes=@minutes WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@minutes", minutes); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@minutes", minutes); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -3944,13 +3973,13 @@ namespace HISP.Server } public static int GetFreeTime(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT FreeMinutes FROM UserExt WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int freeMinutes = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3960,13 +3989,13 @@ namespace HISP.Server } public static int GetUserSubscriptionExpireDate(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT SubscribedUntil FROM UserExt WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int subscribedUntil = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -3976,13 +4005,13 @@ namespace HISP.Server } public static bool IsUserAdmin(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Admin FROM Users WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); bool admin = sqlCommand.ExecuteScalar().ToString() == "YES"; @@ -3995,13 +4024,13 @@ namespace HISP.Server if (ConfigReader.AllUsersSubbed) return true; - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Subscriber FROM UserExt WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); bool subscribed = sqlCommand.ExecuteScalar().ToString() == "YES"; @@ -4011,15 +4040,15 @@ namespace HISP.Server } public static void AddNewTrackedQuest(int playerId, int questId, int timesCompleted) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO TrackedQuest VALUES(@playerId,@questId,@timesCompleted)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@questId", questId); - sqlCommand.Parameters.AddWithValue("@timesCompleted", timesCompleted); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@questId", questId); + addWithValue(sqlCommand, "@timesCompleted", timesCompleted); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4027,17 +4056,17 @@ namespace HISP.Server } public static void AddOnlineUser(int playerId, bool Admin, bool Moderator, bool Subscribed, bool New) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO OnlineUsers VALUES(@playerId, @admin, @moderator, @subscribed, @new)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@admin", Admin ? "YES" : "NO"); - sqlCommand.Parameters.AddWithValue("@moderator", Moderator ? "YES" : "NO"); - sqlCommand.Parameters.AddWithValue("@subscribed", Subscribed ? "YES" : "NO"); - sqlCommand.Parameters.AddWithValue("@new", New ? "YES" : "NO"); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@admin", Admin ? "YES" : "NO"); + addWithValue(sqlCommand, "@moderator", Moderator ? "YES" : "NO"); + addWithValue(sqlCommand, "@subscribed", Subscribed ? "YES" : "NO"); + addWithValue(sqlCommand, "@new", New ? "YES" : "NO"); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4045,13 +4074,13 @@ namespace HISP.Server } public static void RemoveOnlineUser(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM OnlineUsers WHERE (playerId=@playerId)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4059,15 +4088,15 @@ namespace HISP.Server } public static ItemInstance[] GetShopInventory(int shopId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT ItemId,RandomId,Data FROM ShopInventory WHERE ShopID=@shopId"; - sqlCommand.Parameters.AddWithValue("@shopId", shopId); + addWithValue(sqlCommand, "@shopId", shopId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); List instances = new List(); while (reader.Read()) @@ -4081,16 +4110,16 @@ namespace HISP.Server public static void AddItemToShopInventory(int shopId, ItemInstance instance) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO ShopInventory VALUES(@shopId,@randomId,@itemId,@data)"; - sqlCommand.Parameters.AddWithValue("@shopId", shopId); - sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId); - sqlCommand.Parameters.AddWithValue("@itemId", instance.ItemId); - sqlCommand.Parameters.AddWithValue("@data", instance.Data); + addWithValue(sqlCommand, "@shopId", shopId); + addWithValue(sqlCommand, "@randomId", instance.RandomId); + addWithValue(sqlCommand, "@itemId", instance.ItemId); + addWithValue(sqlCommand, "@data", instance.Data); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4099,14 +4128,14 @@ namespace HISP.Server public static void RemoveItemFromShopInventory(int shopId, ItemInstance instance) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM ShopInventory WHERE (ShopID=@shopId AND RandomId=@randomId)"; - sqlCommand.Parameters.AddWithValue("@shopId", shopId); - sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId); + addWithValue(sqlCommand, "@shopId", shopId); + addWithValue(sqlCommand, "@randomId", instance.RandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4115,15 +4144,15 @@ namespace HISP.Server public static ItemInstance[] GetPlayerInventory(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT ItemId,RandomId,Data FROM Inventory WHERE PlayerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); List instances = new List(); while (reader.Read()) @@ -4137,13 +4166,13 @@ namespace HISP.Server public static int[] GetModsAndAdmins() { List userList = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT id FROM Users WHERE Moderator=\"YES\" AND Admin=\"YES\""; - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { userList.Add(reader.GetInt32(0)); @@ -4156,13 +4185,13 @@ namespace HISP.Server public static int[] GetUsers() { List userList = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT id FROM Users"; - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { userList.Add(reader.GetInt32(0)); @@ -4174,13 +4203,13 @@ namespace HISP.Server public static int[] GetModeratorUsers() { List userList = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT id FROM Users WHERE Moderator=\"YES\" OR Admin=\"YES\""; - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { userList.Add(reader.GetInt32(0)); @@ -4192,16 +4221,16 @@ namespace HISP.Server public static void AddItemToInventory(int playerId, ItemInstance instance) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Inventory VALUES(@playerId,@randomId,@itemId, @data)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId); - sqlCommand.Parameters.AddWithValue("@itemId", instance.ItemId); - sqlCommand.Parameters.AddWithValue("@data", instance.Data); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@randomId", instance.RandomId); + addWithValue(sqlCommand, "@itemId", instance.ItemId); + addWithValue(sqlCommand, "@data", instance.Data); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4210,14 +4239,14 @@ namespace HISP.Server public static void RemoveAllItemTypesFromPlayerInventory(int playerId, int itemId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Inventory WHERE (PlayerId=@playerId AND ItemID=@itemId)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@itemId", itemId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@itemId", itemId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4225,14 +4254,14 @@ namespace HISP.Server } public static void RemoveItemFromInventory(int playerId, ItemInstance instance) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Inventory WHERE (PlayerId=@playerId AND RandomId=@randomId)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@randomId", instance.RandomId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@randomId", instance.RandomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4241,14 +4270,14 @@ namespace HISP.Server public static bool HasNpcStartpointSet(int playerId, int npcId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM NpcStartPoint WHERE playerId=@playerId AND npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); int total = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4257,13 +4286,13 @@ namespace HISP.Server } public static bool HasNpcPos(int npcId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM NpcPos WHERE npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); int total = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4272,14 +4301,14 @@ namespace HISP.Server } public static void SetNpcY(int npcId, int x) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE NpcPos SET Y=@yPos WHERE npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@yPos", x); - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@yPos", x); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4287,14 +4316,14 @@ namespace HISP.Server } public static void SetNpcX(int npcId, int x) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE NpcPos SET X=@xPos WHERE npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@xPos", x); - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@xPos", x); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4302,14 +4331,14 @@ namespace HISP.Server } public static void SetNpcUdlrPointer(int npcId, int udlr) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE NpcPos SET UdlrPointer=@udlr WHERE npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@udlr", udlr); - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@udlr", udlr); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4317,13 +4346,13 @@ namespace HISP.Server } public static int GetNpcUdlrPointer(int npcId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT UdlrPointer FROM NpcPos WHERE npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); int udlrPointer = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4332,13 +4361,13 @@ namespace HISP.Server } public static int GetNpcPosY(int npcId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT y FROM NpcPos WHERE npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); int y = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4347,13 +4376,13 @@ namespace HISP.Server } public static int GetNpcPosX(int npcId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT X FROM NpcPos WHERE npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); int x = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4362,16 +4391,16 @@ namespace HISP.Server } public static void AddNpcPos(int npcId, int X, int Y, int udlrPointer) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO NpcPos VALUES(@npcId, @xPos, @yPos, @udlr)"; - sqlCommand.Parameters.AddWithValue("@npcId", npcId); - sqlCommand.Parameters.AddWithValue("@xPos", X); - sqlCommand.Parameters.AddWithValue("@yPos", Y); - sqlCommand.Parameters.AddWithValue("@udlr", udlrPointer); + addWithValue(sqlCommand, "@npcId", npcId); + addWithValue(sqlCommand, "@xPos", X); + addWithValue(sqlCommand, "@yPos", Y); + addWithValue(sqlCommand, "@udlr", udlrPointer); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4379,15 +4408,15 @@ namespace HISP.Server } public static void AddNpcStartPoint(int playerId, int npcId, int startChatpoint) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO NpcStartPoint VALUES(@playerId, @npcId, @chatpointId)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@npcId", npcId); - sqlCommand.Parameters.AddWithValue("@chatpointId", startChatpoint); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@npcId", npcId); + addWithValue(sqlCommand, "@chatpointId", startChatpoint); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4395,15 +4424,15 @@ namespace HISP.Server } public static void SetNpcStartPoint(int playerId, int npcId, int startChatpoint) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE NpcStartPoint SET chatpointId=@chatpointId WHERE playerId=@playerId AND npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@npcId", npcId); - sqlCommand.Parameters.AddWithValue("@chatpointId", startChatpoint); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@npcId", npcId); + addWithValue(sqlCommand, "@chatpointId", startChatpoint); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4412,10 +4441,10 @@ namespace HISP.Server public static int GetDroppedItemsCount() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM DroppedItems"; sqlCommand.Prepare(); @@ -4426,14 +4455,14 @@ namespace HISP.Server } public static int GetNpcStartPoint(int playerId, int npcId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT chatpointId FROM NpcStartPoint WHERE playerId=@playerId AND npcId=@npcId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@npcId", npcId); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@npcId", npcId); sqlCommand.Prepare(); int startPoint = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4443,10 +4472,10 @@ namespace HISP.Server public static void RemoveDespawningItems() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM DroppedItems WHERE despawnTimer <=0"; sqlCommand.Prepare(); @@ -4458,13 +4487,13 @@ namespace HISP.Server public static void RemoveDroppedItem(int randomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM DroppedItems WHERE (RandomId=@randomId)"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4474,13 +4503,13 @@ namespace HISP.Server public static DroppedItems.DroppedItem[] GetDroppedItems() { List itemList = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM DroppedItems"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { ItemInstance instance = new ItemInstance(reader.GetInt32(3), reader.GetInt32(2)); @@ -4498,12 +4527,12 @@ namespace HISP.Server } public static void DecrementDroppedItemDespawnTimer() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE DroppedItems SET DespawnTimer=DespawnTimer-1"; sqlCommand.ExecuteNonQuery(); @@ -4513,19 +4542,19 @@ namespace HISP.Server public static void AddDroppedItem(DroppedItems.DroppedItem item) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer, @data)"; - sqlCommand.Parameters.AddWithValue("@x", item.X); - sqlCommand.Parameters.AddWithValue("@y", item.Y); - sqlCommand.Parameters.AddWithValue("@randomId", item.Instance.RandomId); - sqlCommand.Parameters.AddWithValue("@itemId", item.Instance.ItemId); - sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer); - sqlCommand.Parameters.AddWithValue("@data", item.Data); + addWithValue(sqlCommand, "@x", item.X); + addWithValue(sqlCommand, "@y", item.Y); + addWithValue(sqlCommand, "@randomId", item.Instance.RandomId); + addWithValue(sqlCommand, "@itemId", item.Instance.ItemId); + addWithValue(sqlCommand, "@despawnTimer", item.DespawnTimer); + addWithValue(sqlCommand, "@data", item.Data); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4536,16 +4565,16 @@ namespace HISP.Server public static void AddReport(string reportCreator, string reporting, string reportReason) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); int epoch = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; sqlCommand.CommandText = "INSERT INTO AbuseReports VALUES(@reportCreator,@reporting,@reportReason)"; - sqlCommand.Parameters.AddWithValue("@reportCreator", reportCreator); - sqlCommand.Parameters.AddWithValue("@reporting", reporting); - sqlCommand.Parameters.AddWithValue("@reportReason", reportReason); + addWithValue(sqlCommand, "@reportCreator", reportCreator); + addWithValue(sqlCommand, "@reporting", reporting); + addWithValue(sqlCommand, "@reportReason", reportReason); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4555,16 +4584,16 @@ namespace HISP.Server public static Mailbox.Mail[] LoadMailbox(int toId) { List mailList = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Mailbox WHERE IdTo=@toId"; - sqlCommand.Parameters.AddWithValue("@toId", toId); + addWithValue(sqlCommand, "@toId", toId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { Mailbox.Mail MailMessage = new Mailbox.Mail(); @@ -4583,14 +4612,14 @@ namespace HISP.Server } public static void ReadAllMail(int toId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Mailbox SET BeenRead='YES' WHERE IdTo=@toId"; - sqlCommand.Parameters.AddWithValue("@toId", toId); + addWithValue(sqlCommand, "@toId", toId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4598,14 +4627,14 @@ namespace HISP.Server } public static void DeleteMail(int randomId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Mailbox WHERE randomId=@randomId"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); + addWithValue(sqlCommand, "@randomId", randomId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4613,20 +4642,20 @@ namespace HISP.Server } public static void AddMail(int randomId, int toId, int fromId, string subject, string message, int timestamp, bool read) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Mailbox VALUES(@randomId, @toId,@from,@subject,@message,@time,@read)"; - sqlCommand.Parameters.AddWithValue("@randomId", randomId); - sqlCommand.Parameters.AddWithValue("@toId", toId); - sqlCommand.Parameters.AddWithValue("@from", fromId); - sqlCommand.Parameters.AddWithValue("@subject", subject); - sqlCommand.Parameters.AddWithValue("@message", message); - sqlCommand.Parameters.AddWithValue("@time", timestamp); - sqlCommand.Parameters.AddWithValue("@read", read ? "YES" : "NO"); + addWithValue(sqlCommand, "@randomId", randomId); + addWithValue(sqlCommand, "@toId", toId); + addWithValue(sqlCommand, "@from", fromId); + addWithValue(sqlCommand, "@subject", subject); + addWithValue(sqlCommand, "@message", message); + addWithValue(sqlCommand, "@time", timestamp); + addWithValue(sqlCommand, "@read", read ? "YES" : "NO"); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4636,12 +4665,12 @@ namespace HISP.Server public static bool CheckUserExist(int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM Users WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); Int32 count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4652,12 +4681,12 @@ namespace HISP.Server } public static bool CheckUserExist(string username) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM Users WHERE Username=@name"; - sqlCommand.Parameters.AddWithValue("@name", username); + addWithValue(sqlCommand, "@name", username); sqlCommand.Prepare(); Int32 count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4668,12 +4697,12 @@ namespace HISP.Server } public static bool CheckUserExtExists(int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); Int32 count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4686,14 +4715,14 @@ namespace HISP.Server public static bool CheckUserIsModerator(string username) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(username)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Moderator FROM Users WHERE Username=@name"; - sqlCommand.Parameters.AddWithValue("@name", username); + addWithValue(sqlCommand, "@name", username); sqlCommand.Prepare(); string modStr = sqlCommand.ExecuteScalar().ToString(); @@ -4710,14 +4739,14 @@ namespace HISP.Server public static bool CheckUserIsAdmin(string username) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(username)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Admin FROM Users WHERE Username=@name"; - sqlCommand.Parameters.AddWithValue("@name", username); + addWithValue(sqlCommand, "@name", username); sqlCommand.Prepare(); string adminStr = sqlCommand.ExecuteScalar().ToString(); @@ -4733,12 +4762,12 @@ namespace HISP.Server public static int GetBuddyCount(int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT COUNT(1) FROM BuddyList WHERE Id=@id OR IdFriend=@id"; - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); Int32 count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4750,7 +4779,7 @@ namespace HISP.Server public static int[] GetBuddyList(int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (GetBuddyCount(id) <= 0) @@ -4758,11 +4787,11 @@ namespace HISP.Server List BuddyList = new List(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Id,IdFriend FROM BuddyList WHERE Id=@id OR IdFriend=@id"; - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); - MySqlDataReader dataReader = sqlCommand.ExecuteReader(); + DbDataReader dataReader = sqlCommand.ExecuteReader(); while (dataReader.Read()) { @@ -4781,13 +4810,13 @@ namespace HISP.Server public static void RemoveBuddy(int id, int friendId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM BuddyList WHERE (Id=@id AND IdFriend=@friendId) OR (Id=@friendid AND IdFriend=@Id)"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@friendId", friendId); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@friendId", friendId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4796,13 +4825,13 @@ namespace HISP.Server public static void AddBuddy(int id, int friendId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO BuddyList VALUES(@id,@friendId)"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@friendId", friendId); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@friendId", friendId); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4811,15 +4840,15 @@ namespace HISP.Server } public static string GetIpAddress(int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (!CheckUserExtExists(id)) // user allready exists! throw new Exception("Userid " + id + " Does not exist in UserExt."); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT IpAddress FROM UserExt WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", id); + addWithValue(sqlCommand, "@playerId", id); sqlCommand.Prepare(); string IpAddress = sqlCommand.ExecuteScalar().ToString(); @@ -4828,16 +4857,16 @@ namespace HISP.Server } public static void SetIpAddress(int id, string ipAddress) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (!CheckUserExtExists(id)) // user allready exists! throw new Exception("Userid " + id + " Does not exist in UserExt."); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET IpAddress=@ipAddr WHERE Id=@playerId"; - sqlCommand.Parameters.AddWithValue("@ipAddr", ipAddress); - sqlCommand.Parameters.AddWithValue("@playerId", id); + addWithValue(sqlCommand, "@ipAddr", ipAddress); + addWithValue(sqlCommand, "@playerId", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4845,20 +4874,42 @@ namespace HISP.Server } } + public static void CreateUser(int id, string username, string passhash, string salt, string gender, bool admin, bool moderator) + { + using (DbConnection db = connectDb()) + { + db.Open(); + DbCommand sqlCommand = db.CreateCommand(); + sqlCommand.CommandText = "INSERT INTO Users VALUES(@id,@username,@passhash,@salt,@gender,@admin,@moderator)"; + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@username", username); + addWithValue(sqlCommand, "@passhash", passhash); + addWithValue(sqlCommand, "@salt", salt); + addWithValue(sqlCommand, "@gender", gender); + addWithValue(sqlCommand, "@admin", admin ? "YES" : "NO"); + addWithValue(sqlCommand, "@moderator", moderator ? "YES" : "NO"); + sqlCommand.Prepare(); + sqlCommand.ExecuteNonQuery(); + + + } + } + + public static void CreateUserExt(int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(id)) // user allready exists! throw new Exception("Userid " + id + " Allready in UserExt."); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO UserExt VALUES(@id,@x,@y,@timestamp,0,0,0,0,'','','',0,0,'NO',0,0,1000,1000,1000, 180,1)"; - sqlCommand.Parameters.AddWithValue("@id", id); - sqlCommand.Parameters.AddWithValue("@timestamp", Convert.ToInt32(new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds())); - sqlCommand.Parameters.AddWithValue("@x", Map.NewUserStartX); - sqlCommand.Parameters.AddWithValue("@y", Map.NewUserStartY); + addWithValue(sqlCommand, "@id", id); + addWithValue(sqlCommand, "@timestamp", Convert.ToInt32(new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds())); + addWithValue(sqlCommand, "@x", Map.NewUserStartX); + addWithValue(sqlCommand, "@y", Map.NewUserStartY); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4868,14 +4919,14 @@ namespace HISP.Server public static int GetUserid(string username) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(username)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Id FROM Users WHERE Username=@name"; - sqlCommand.Parameters.AddWithValue("@name", username); + addWithValue(sqlCommand, "@name", username); sqlCommand.Prepare(); int userId = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4891,14 +4942,14 @@ namespace HISP.Server public static string GetPlayerNotes(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT PrivateNotes FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); string privateNotes = sqlCommand.ExecuteScalar().ToString(); @@ -4914,15 +4965,15 @@ namespace HISP.Server public static void SetPlayerNotes(int id, string notes) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET PrivateNotes=@notes WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@notes", notes); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@notes", notes); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4938,14 +4989,14 @@ namespace HISP.Server public static int GetPlayerCharId(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT CharId FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int CharId = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -4961,15 +5012,15 @@ namespace HISP.Server public static void SetPlayerCharId(int charid, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET CharId=@charId WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@charId", charid); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@charId", charid); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -4984,14 +5035,14 @@ namespace HISP.Server public static int GetPlayerX(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT X FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int X = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5007,15 +5058,15 @@ namespace HISP.Server public static void SetPlayerX(int x, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET X=@x WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@x", x); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@x", x); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5030,14 +5081,14 @@ namespace HISP.Server public static int GetPlayerY(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Y FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int Y = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5053,14 +5104,14 @@ namespace HISP.Server public static int GetChatViolations(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT ChatViolations FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int violations = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5077,15 +5128,15 @@ namespace HISP.Server public static void SetChatViolations(int violations, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET ChatViolations=@violations WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@violations", violations); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@violations", violations); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5099,15 +5150,15 @@ namespace HISP.Server } public static void SetPlayerY(int y, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET Y=@y WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@y", y); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@y", y); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5122,15 +5173,15 @@ namespace HISP.Server public static void SetPlayerQuestPoints(int qp, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET QuestPoints=@questPoints WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@questPoints", qp); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@questPoints", qp); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5144,14 +5195,14 @@ namespace HISP.Server } public static int GetPlayerQuestPoints(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT QuestPoints FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int QuestPoints = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5168,15 +5219,15 @@ namespace HISP.Server public static void SetPlayerMoney(int money, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET Money=@money WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@money", money); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@money", money); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5192,14 +5243,14 @@ namespace HISP.Server public static HorseInstance[] GetMostExperiencedHorses() { List inst = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Horses ORDER BY experience DESC LIMIT 25"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { inst.Add(ReadHorseInstance(reader)); @@ -5211,14 +5262,14 @@ namespace HISP.Server public static int[] GetMinigamePlayers() { List userIds = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT DISTINCT playerId, SUM(timesplayed) OVER (PARTITION BY playerId) AS totalPlays FROM Leaderboards ORDER BY totalPlays DESC LIMIT 25"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { userIds.Add(reader.GetInt32(0)); @@ -5232,14 +5283,14 @@ namespace HISP.Server public static int[] GetExperiencedPlayers() { List userIds = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT id FROM UserExt ORDER BY Experience DESC LIMIT 25"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { userIds.Add(reader.GetInt32(0)); @@ -5252,14 +5303,14 @@ namespace HISP.Server public static int[] GetAdventurousPlayers() { List userIds = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT id FROM UserExt ORDER BY QuestPoints DESC LIMIT 25"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { userIds.Add(reader.GetInt32(0)); @@ -5272,14 +5323,14 @@ namespace HISP.Server public static int[] GetRichestPlayers() { List userIds = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT id FROM UserExt ORDER BY Money+BankBalance DESC LIMIT 25"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { userIds.Add(reader.GetInt32(0)); @@ -5292,14 +5343,14 @@ namespace HISP.Server public static HorseInstance[] GetMostSpoiledHorses() { List inst = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Horses ORDER BY spoiled DESC LIMIT 100"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { inst.Add(ReadHorseInstance(reader)); @@ -5311,14 +5362,14 @@ namespace HISP.Server public static HorseInstance[] GetBiggestExpAutoSell() { List inst = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Horses WHERE autoSell > 0 ORDER BY experience DESC LIMIT 50"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { inst.Add(ReadHorseInstance(reader)); @@ -5330,14 +5381,14 @@ namespace HISP.Server public static HorseInstance[] GetCheapestHorseAutoSell() { List inst = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Horses WHERE autoSell > 0 ORDER BY autoSell LIMIT 100"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { inst.Add(ReadHorseInstance(reader)); @@ -5348,13 +5399,13 @@ namespace HISP.Server } public static int GetPlayerTotalMinigamesPlayed(int playerId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT SUM(timesplayed) FROM Leaderboards WHERE playerId=@playerId"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); int count = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5365,17 +5416,17 @@ namespace HISP.Server public static void AddNewWinner(int playerId, string gameTitle, int wins, int looses) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Leaderboards VALUES(@playerId,@gameTitle,@wins,@loose,1,0,@type)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); - sqlCommand.Parameters.AddWithValue("@wins", wins); - sqlCommand.Parameters.AddWithValue("@loose", looses); - sqlCommand.Parameters.AddWithValue("@type", "WINLOSS"); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@gameTitle", gameTitle); + addWithValue(sqlCommand, "@wins", wins); + addWithValue(sqlCommand, "@loose", looses); + addWithValue(sqlCommand, "@type", "WINLOSS"); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5385,16 +5436,16 @@ namespace HISP.Server } public static void AddNewHighscore(int playerId, string gameTitle, int score, string type) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "INSERT INTO Leaderboards VALUES(@playerId,@gameTitle,0,0,1,@score,@type)"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); - sqlCommand.Parameters.AddWithValue("@score", score); - sqlCommand.Parameters.AddWithValue("@type", type); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@gameTitle", gameTitle); + addWithValue(sqlCommand, "@score", score); + addWithValue(sqlCommand, "@type", type); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5406,14 +5457,14 @@ namespace HISP.Server public static Highscore.HighscoreTableEntry[] GetPlayerHighScores(int playerId) { List entires = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Leaderboards WHERE playerId=@playerId ORDER BY score DESC"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); + addWithValue(sqlCommand, "@playerId", playerId); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { @@ -5437,15 +5488,15 @@ namespace HISP.Server public static Highscore.HighscoreTableEntry[] GetTopWinners(string gameTitle, int limit) { List entires = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT * FROM Leaderboards WHERE minigame=@gameTitle ORDER BY wins DESC LIMIT @limit"; - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); - sqlCommand.Parameters.AddWithValue("@limit", limit); + addWithValue(sqlCommand, "@gameTitle", gameTitle); + addWithValue(sqlCommand, "@limit", limit); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while (reader.Read()) { @@ -5469,18 +5520,18 @@ namespace HISP.Server public static Highscore.HighscoreTableEntry[] GetTopScores(string gameTitle, int limit, bool scores=true) { List entires = new List(); - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); if(scores) sqlCommand.CommandText = "SELECT * FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score DESC LIMIT @limit"; else sqlCommand.CommandText = "SELECT * FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score ASC LIMIT @limit"; - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); - sqlCommand.Parameters.AddWithValue("@limit", limit); + addWithValue(sqlCommand, "@gameTitle", gameTitle); + addWithValue(sqlCommand, "@limit", limit); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { @@ -5503,18 +5554,18 @@ namespace HISP.Server public static int GetRanking(int score, string gameTitle, bool time=false) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); if(time) sqlCommand.CommandText = "SELECT DISTINCT score FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score ASC"; else sqlCommand.CommandText = "SELECT DISTINCT score FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score DESC"; - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); + addWithValue(sqlCommand, "@gameTitle", gameTitle); sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); int i = 1; while(reader.Read()) { @@ -5529,14 +5580,14 @@ namespace HISP.Server } public static void UpdateHighscoreWinGame(int playerId, string gameTitle) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Leaderboards SET wins=wins+1, timesplayed=timesplayed+1 WHERE playerId=@playerId AND minigame=@gameTitle"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@gameTitle", gameTitle); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5546,14 +5597,14 @@ namespace HISP.Server } public static void UpdateHighscoreLooseGame(int playerId, string gameTitle) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Leaderboards SET looses=looses+1, timesplayed=timesplayed+1 WHERE playerId=@playerId AND minigame=@gameTitle"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@gameTitle", gameTitle); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5563,15 +5614,15 @@ namespace HISP.Server } public static void UpdateHighscore(int playerId, string gameTitle, int score) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Leaderboards SET score=@score, timesplayed=timesplayed+1 WHERE playerId=@playerId AND minigame=@gameTitle"; - sqlCommand.Parameters.AddWithValue("@playerId", playerId); - sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle); - sqlCommand.Parameters.AddWithValue("@score", score); + addWithValue(sqlCommand, "@playerId", playerId); + addWithValue(sqlCommand, "@gameTitle", gameTitle); + addWithValue(sqlCommand, "@score", score); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5582,10 +5633,10 @@ namespace HISP.Server public static void DeleteExpiredLeasedHorsesForOfflinePlayers() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "DELETE FROM Horses WHERE ownerId NOT IN (SELECT playerId FROM OnlineUsers) AND leaseTime <= 0 AND leaser > 0"; sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5596,14 +5647,14 @@ namespace HISP.Server } public static void TpOfflinePlayersBackToUniterForOfflinePlayers() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT ownerId, breed, leaser FROM Horses WHERE ownerId NOT IN (SELECT playerId FROM OnlineUsers) AND leaseTime <= 0 AND leaser > 0"; sqlCommand.Prepare(); - MySqlDataReader reader = sqlCommand.ExecuteReader(); + DbDataReader reader = sqlCommand.ExecuteReader(); while(reader.Read()) { @@ -5639,10 +5690,10 @@ namespace HISP.Server public static void DecrementHorseLeaseTimeForOfflinePlayers() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE Horses SET leaseTime = leaseTime - 1 WHERE ownerId NOT IN (SELECT playerId FROM OnlineUsers) AND leaseTime > 0 AND leaser > 0"; sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5654,10 +5705,10 @@ namespace HISP.Server } public static void IncPlayerTirednessForOfflineUsers() { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET tiredness = tiredness + 1 WHERE id NOT IN (SELECT playerId FROM OnlineUsers) AND NOT tiredness +1 > 1000"; sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5669,14 +5720,14 @@ namespace HISP.Server public static int GetPlayerTiredness(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Tiredness FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int tiredness = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5692,15 +5743,15 @@ namespace HISP.Server public static void SetPlayerTiredness(int id, int tiredness) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET Tiredness=@tiredness WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@tiredness", tiredness); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@tiredness", tiredness); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5715,15 +5766,15 @@ namespace HISP.Server public static void SetPlayerHunger(int id, int hunger) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET Hunger=@hunger WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@Hunger", hunger); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@Hunger", hunger); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5740,14 +5791,14 @@ namespace HISP.Server public static int GetPlayerHunger(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Hunger FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int hunger = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5763,15 +5814,15 @@ namespace HISP.Server public static void SetPlayerThirst(int id, int thirst) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET Thirst=@thirst WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@thirst", thirst); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@thirst", thirst); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5786,14 +5837,14 @@ namespace HISP.Server public static int GetPlayerThirst(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Thirst FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int tiredness = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5809,14 +5860,14 @@ namespace HISP.Server public static int GetPlayerLastLogin(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT LastLogin FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int lastLogin = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5832,15 +5883,15 @@ namespace HISP.Server public static void SetPlayerLastLogin(int lastlogin, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET LastLogin=@lastlogin WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@lastlogin", lastlogin); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@lastlogin", lastlogin); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5855,14 +5906,14 @@ namespace HISP.Server public static int GetPlayerMoney(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Money FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); int Money = Convert.ToInt32(sqlCommand.ExecuteScalar()); @@ -5878,14 +5929,14 @@ namespace HISP.Server public static double GetPlayerBankMoney(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT BankBalance FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); double BankMoney = Convert.ToDouble(sqlCommand.ExecuteScalar()); @@ -5901,14 +5952,14 @@ namespace HISP.Server public static double GetPlayerBankInterest(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExtExists(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT BankInterest FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); double BankInterest = Convert.ToDouble(sqlCommand.ExecuteScalar()); @@ -5929,12 +5980,12 @@ namespace HISP.Server Logger.WarnPrint("Intrest rate is 0, as deviding by 0 causes the universe to implode, adding intrest has been skipped."); return; } - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET BankInterest = BankInterest + (BankInterest * (1/@interestRate)) WHERE NOT BankInterest + (BankInterest * (1/@interestRate)) > 9999999999.9999"; - sqlCommand.Parameters.AddWithValue("@interestRate", intrestRate); + addWithValue(sqlCommand, "@interestRate", intrestRate); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5944,15 +5995,15 @@ namespace HISP.Server public static void SetPlayerBankInterest(double interest, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET BankInterest=@interest WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@interest", interest); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@interest", interest); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5966,15 +6017,15 @@ namespace HISP.Server } public static void SetPlayerBankMoney(double bankMoney, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET BankBalance=@bankMoney WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@bankMoney", bankMoney); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@bankMoney", bankMoney); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -5989,15 +6040,15 @@ namespace HISP.Server public static void SetPlayerProfile(string profilePage, int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "UPDATE UserExt SET ProfilePage=@profilePage WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@profilePage", profilePage); - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@profilePage", profilePage); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); sqlCommand.ExecuteNonQuery(); @@ -6012,14 +6063,14 @@ namespace HISP.Server public static string GetPlayerProfile(int id) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(id)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT ProfilePage FROM UserExt WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", id); + addWithValue(sqlCommand, "@id", id); sqlCommand.Prepare(); string profilePage = sqlCommand.ExecuteScalar().ToString(); @@ -6036,14 +6087,14 @@ namespace HISP.Server public static string GetUsername(int userId) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(userId)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT Username FROM Users WHERE Id=@id"; - sqlCommand.Parameters.AddWithValue("@id", userId); + addWithValue(sqlCommand, "@id", userId); sqlCommand.Prepare(); string username = sqlCommand.ExecuteScalar().ToString(); @@ -6058,14 +6109,14 @@ namespace HISP.Server } public static byte[] GetPasswordHash(string username) { - using (MySqlConnection db = new MySqlConnection(ConnectionString)) + using (DbConnection db = connectDb()) { db.Open(); if (CheckUserExist(username)) { - MySqlCommand sqlCommand = db.CreateCommand(); + DbCommand sqlCommand = db.CreateCommand(); sqlCommand.CommandText = "SELECT PassHash FROM Users WHERE Username=@name"; - sqlCommand.Parameters.AddWithValue("@name", username); + addWithValue(sqlCommand, "@name", username); sqlCommand.Prepare(); string expectedHash = sqlCommand.ExecuteScalar().ToString(); diff --git a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs b/HorseIsleServer/LibHISP/Server/GameClient.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Server/GameClient.cs rename to HorseIsleServer/LibHISP/Server/GameClient.cs diff --git a/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs b/HorseIsleServer/LibHISP/Server/GameDataJson.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs rename to HorseIsleServer/LibHISP/Server/GameDataJson.cs diff --git a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs b/HorseIsleServer/LibHISP/Server/GameServer.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Server/GameServer.cs rename to HorseIsleServer/LibHISP/Server/GameServer.cs diff --git a/HorseIsleServer/HorseIsleServer/Server/Logger.cs b/HorseIsleServer/LibHISP/Server/Logger.cs similarity index 50% rename from HorseIsleServer/HorseIsleServer/Server/Logger.cs rename to HorseIsleServer/LibHISP/Server/Logger.cs index 8d65e87..2f1eb7d 100644 --- a/HorseIsleServer/HorseIsleServer/Server/Logger.cs +++ b/HorseIsleServer/LibHISP/Server/Logger.cs @@ -4,35 +4,43 @@ namespace HISP.Server { public class Logger { + private static void defaultCallbackFunc(string txt) + { + return; + } + + private static Action logFunction = defaultCallbackFunc; + + + public static void SetCallback(Action callback) + { + logFunction = callback; + } + public static void ErrorPrint(string text) { if (ConfigReader.LogLevel >= 1) - Console.WriteLine("[ERROR] " + text); + logFunction("[ERROR] " + text); } public static void WarnPrint(string text) { if (ConfigReader.LogLevel >= 2) - Console.WriteLine("[WARN] " + text); + logFunction("[WARN] " + text); } - public static void HackerPrint(string text) // When someone is obviously cheating. + public static void HackerPrint(string text) { if (ConfigReader.LogLevel >= 3) - { - ConsoleColor prevColor = Console.ForegroundColor; - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine("[HACK] " + text); - Console.ForegroundColor = prevColor; - } + logFunction("[HACK] " + text); } public static void InfoPrint(string text) { if (ConfigReader.LogLevel >= 4) - Console.WriteLine("[INFO] " + text); + logFunction("[INFO] " + text); } public static void DebugPrint(string text) { if (ConfigReader.LogLevel >= 5) - Console.WriteLine("[DEBUG] " + text); + logFunction("[DEBUG] " + text); } } } diff --git a/HorseIsleServer/HorseIsleServer/Server/PacketBuilder.cs b/HorseIsleServer/LibHISP/Server/PacketBuilder.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Server/PacketBuilder.cs rename to HorseIsleServer/LibHISP/Server/PacketBuilder.cs diff --git a/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs b/HorseIsleServer/LibHISP/Server/ServerVersion.cs similarity index 97% rename from HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs rename to HorseIsleServer/LibHISP/Server/ServerVersion.cs index e5e1ceb..665ce35 100644 --- a/HorseIsleServer/HorseIsleServer/Server/ServerVersion.cs +++ b/HorseIsleServer/LibHISP/Server/ServerVersion.cs @@ -5,7 +5,7 @@ namespace HISP.Server public class ServerVersion { public static int MAJOR = 1; - public static int MINOR = 2; + public static int MINOR = 3; public static string PRODUCT = "HISP"; public static string GetArchitecture() diff --git a/HorseIsleServer/HorseIsleServer/Program.cs b/HorseIsleServer/LibHISP/Server/Start.cs similarity index 78% rename from HorseIsleServer/HorseIsleServer/Program.cs rename to HorseIsleServer/LibHISP/Server/Start.cs index e580faf..c219987 100644 --- a/HorseIsleServer/HorseIsleServer/Program.cs +++ b/HorseIsleServer/LibHISP/Server/Start.cs @@ -1,24 +1,22 @@ -using System; -using HISP.Game; -using HISP.Game.Items; +using HISP.Game; using HISP.Game.Horse; +using HISP.Game.Items; +using HISP.Game.Services; using HISP.Game.SwfModules; using HISP.Security; -using HISP.Server; -using HISP.Game.Services; -using System.IO; +using System; -namespace HISP +namespace HISP.Server { - public class Program + public static class Start { - public static bool ShuttingDown = false; - static void Main(string[] args) + // "Entry Point" + public static void InitalizeAndStart() { - #if (!DEBUG) + #if (!DEBUG) AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); - #endif - + #endif + Console.Title = ServerVersion.GetBuildString(); ConfigReader.OpenConfig(); CrossDomainPolicy.GetPolicy(); @@ -41,21 +39,19 @@ namespace HISP Item.DoSpecialCases(); GameServer.StartServer(); - - while (true) { }; } private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { Exception execpt = (Exception)e.ExceptionObject; - + Logger.ErrorPrint("HISP HAS CRASHED :("); Logger.ErrorPrint("Unhandled Exception: " + execpt.ToString()); Logger.ErrorPrint(execpt.Message); Logger.ErrorPrint(""); Logger.ErrorPrint(execpt.StackTrace); - while (!ShuttingDown) { /*Allow asyncronous operations to happen.*/ }; + while (true) { /* Allow asyncronous operations to happen. */ }; } } } diff --git a/HorseIsleServer/HorseIsleServer/Server/Util.cs b/HorseIsleServer/LibHISP/Server/Util.cs similarity index 100% rename from HorseIsleServer/HorseIsleServer/Server/Util.cs rename to HorseIsleServer/LibHISP/Server/Util.cs diff --git a/HorseIsleServer/N00BS/HTTP/ContentServer.cs b/HorseIsleServer/N00BS/HTTP/ContentServer.cs new file mode 100644 index 0000000..b0919f7 --- /dev/null +++ b/HorseIsleServer/N00BS/HTTP/ContentServer.cs @@ -0,0 +1,319 @@ +using System.Net; +using System.Net.Sockets; +using System.Text; + +namespace HTTP +{ + class ContentItem + { + + public String name; + public String filePath; + public ContentItem(string Name,string FilePath) + { + if(File.Exists(FilePath)) + { + filePath = FilePath; + name = Name; + } + else + { + throw new FileNotFoundException(); + } + } + + } + + class ContentClient + { + + public ContentClient(ContentServer Server, Socket ClientSocket) + { + clientSock = ClientSocket; + baseServ = Server; + Server.Clients.Add(this); + baseServ.WriteDebugOutput("Client Connected @ " + clientSock.RemoteEndPoint.ToString()); + ProcessRequests(); + clientSock.Close(); + + } + + private ContentServer baseServ; + private Socket clientSock; + + + private byte[] ReadData() + { + while (clientSock.Available < 1) { } + byte[] by = new byte[clientSock.Available]; + clientSock.Receive(by); + return by; + } + + private void SendString(string str) + { + byte[] response = Encoding.UTF8.GetBytes(str); + clientSock.Send(response); + } + + private string GenerateHeaders(string path, long content_length = 0) + { + string headers = ""; + + if (path == "/") + { + headers += "HTTP/1.1 200 OK\r\n"; + headers += "Content-Type: text/html\r\n"; + headers += "Accept-Ranges: bytes\r\n"; + headers += "Server: ContentServer\r\n"; + headers += "Content-Length: " + content_length + "\r\n"; + headers += "Cache-Control: max-age=0\r\n"; + headers += "Connection: keep-alive\r\n"; + headers += "\r\n"; + } + else if (File.Exists(path)) + { + FileInfo info = new FileInfo(path); + long length = info.Length; + + if (content_length != 0) + length = content_length; + + + headers += "HTTP/1.1 200 OK\r\n"; + headers += "Content-Type: application/x-shockwave-flash\r\n"; + headers += "Accept-Ranges: bytes\r\n"; + headers += "Server: ContentServer\r\n"; + headers += "Content-Length: " + length + "\r\n"; + headers += "Cache-Control: max-age=0\r\n"; + headers += "Connection: keep-alive\r\n"; + headers += "\r\n"; + } + else + { + headers += "HTTP/1.1 404 Not Found\r\n"; + headers += "Content-Type: text/plain\r\n"; + headers += "Accept-Ranges: bytes\r\n"; + headers += "Server: ContentServer\r\n"; + headers += "Content-Length: " + content_length + "\r\n"; + headers += "Cache-Control: max-age=3600\r\n"; + headers += "Connection: keep-alive\r\n"; + headers += "\r\n"; + } + return headers; + } + + private void RespondGet(string path, Dictionary query) + { + baseServ.WriteDebugOutput("GET " + path); + string name = path.Remove(0, 1); + + if (ContentItemExists(name)) + { + ContentItem ci = GetContentItem(name); + FileStream fs = File.OpenRead(ci.filePath); + try + { + string requestStr = GenerateHeaders(ci.filePath, fs.Length - fs.Position); + + SendString(requestStr); + + while(fs.Position < fs.Length) + { + int BUFFER_SIZE = 0x8500000; + if(fs.Position + BUFFER_SIZE <= fs.Length) + { + byte[] buffer = new byte[BUFFER_SIZE]; + fs.Read(buffer, 0x00, BUFFER_SIZE); + clientSock.Send(buffer); + } + else + { + byte[] buffer = new byte[fs.Length - fs.Position]; + fs.Read(buffer, 0x00, buffer.Length); + clientSock.Send(buffer); + } + + } + } + catch (Exception) { + fs.Close(); + }; + + } + else + { + string body = GeneratePage(path); + string requestStr = GenerateHeaders(path, body.Length); + requestStr += body; + + SendString(requestStr); + } + + } + + private void RespondHead(string path) + { + string name = Path.GetFileName(path); + baseServ.WriteDebugOutput("HEAD " + path); + + if (ContentItemExists(name)) + { + ContentItem ci = GetContentItem(name); + string requestStr = GenerateHeaders(ci.filePath); + SendString(requestStr); + } + else + { + string body = GeneratePage(path); + string requestStr = GenerateHeaders(path, body.Length); + SendString(requestStr); + } + + } + + private bool ContentItemExists(string name) + { + bool exists = false; + + + foreach (ContentItem ci in baseServ.Contents) + { + if (ci.name == name) + { + exists = true; + } + } + return exists; + } + + private ContentItem GetContentItem(string name) + { + + foreach (ContentItem ci in baseServ.Contents) + { + if (ci.name == name) + { + return ci; + } + } + throw new FileNotFoundException(); + } + + private string GeneratePage(string path) + { + if (path == "/") + { + string body = "Content Downloader Server.
Open this url in PSVita's \"Content Downloader\" To view avalible files."; + foreach (ContentItem content in baseServ.Contents) + { + body += ""; + } + + return body; + } + else + { + string body = "File not found."; + return body; + } + } + + private string ExtractPath(string relativeUri) + { + int questionIndex = relativeUri.IndexOf("?"); + if (questionIndex != -1) + return relativeUri.Substring(0, questionIndex); + else + return relativeUri; + } + private Dictionary ExtractQuery(string relativeUri) + { + int questionIndex = relativeUri.IndexOf("?"); + if (questionIndex != -1) + { + string[] queryStrList = relativeUri.Substring(questionIndex + 1).Split('&'); + Dictionary queryDict = new Dictionary(); + foreach(string queryStr in queryStrList) + { + string[] qStr = queryStr.Split('='); + queryDict.Add(qStr[0], qStr[1]); + } + return queryDict; + } + else + return new Dictionary(); + } + private string ExtractRelativeUrl(string header) + { + return header.Split(' ')[1]; + } + private void ProcessRequests() + { + byte[] data = ReadData(); + + // Parse Request + + string curReq = Encoding.UTF8.GetString(data); + + curReq = curReq.Replace("\r\n", "\n"); + string[] reqLines = curReq.Split('\n'); + foreach (string line in reqLines) + { + if (line.StartsWith("GET")) + { + string relUrl = ExtractRelativeUrl(line); + string path = ExtractPath(relUrl); + Dictionary query = ExtractQuery(relUrl); + RespondGet(path, query); + return; + } + else if (line.StartsWith("HEAD")) + { + string relUrl = ExtractRelativeUrl(line); + string path = ExtractPath(relUrl); + RespondHead(path); + return; + } + } + + } + } + class ContentServer + { + public List Contents = new List(); + public List Clients = new List(); + + public void WriteDebugOutput(string txt) + { + Console.WriteLine("[HTTP] "+txt); + } + + public ContentServer() + { + + new Thread(() => + { + WriteDebugOutput("Listening for connections on port 12515."); + IPEndPoint localEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 12515); + Socket newsock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + newsock.Bind(localEndPoint); + newsock.Listen(20); + + while(true) + { + Socket clientSock = newsock.Accept(); + + new Thread(() => + { + ContentClient client = new ContentClient(this, clientSock); + Clients.Remove(client); + }).Start(); + } + + }).Start(); + } + + + } +} diff --git a/HorseIsleServer/N00BS/N00BS.csproj b/HorseIsleServer/N00BS/N00BS.csproj new file mode 100644 index 0000000..c7e1363 --- /dev/null +++ b/HorseIsleServer/N00BS/N00BS.csproj @@ -0,0 +1,20 @@ + + + + Exe + net6.0-windows + enable + enable + HISP.Program + icon.ico + + + + + + + + + + + diff --git a/HorseIsleServer/N00BS/Program.cs b/HorseIsleServer/N00BS/Program.cs new file mode 100644 index 0000000..9849777 --- /dev/null +++ b/HorseIsleServer/N00BS/Program.cs @@ -0,0 +1,77 @@ +// An HTTP Server, and Horse Isle Server, Flash Player, in a single package +// Idea is to just be open and play. + +using HISP.Security; +using HISP.Server; +using HTTP; +using System.Diagnostics; +using System.Reflection; + +namespace HISP +{ + public static class Program + { + private static string baseDir; + private static ContentServer cs; + private static void addToList(string path) + { + string Name = path.Remove(0, Path.Combine(baseDir, "client").Length+1); + Name = Name.Replace("\\", "/"); + + ContentItem ci = new ContentItem(Name, path); + cs.Contents.Add(ci); + + } + + + public static void Main(string[] args) + { + baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + + ConfigReader.OpenConfig(); + if (File.Exists(ConfigReader.ConfigurationFileName)) + File.WriteAllText(ConfigReader.ConfigurationFileName, File.ReadAllText(ConfigReader.ConfigurationFileName).Replace("sql_lite=false", "sql_lite=true")); + + Database.OpenDatabase(); + if(Database.GetUsers().Length == 0) + { + Console.Write("Username: "); + string username = Console.ReadLine(); + Console.Write("Password: "); + string password = Console.ReadLine(); + Console.Write("Gender: "); + string gender = Console.ReadLine(); + + Random r = new Random(); + byte[] salt = new byte[64]; + + r.NextBytes(salt); + + string saltText = BitConverter.ToString(salt).Replace("-", ""); + + string hashsalt = BitConverter.ToString(Authentication.HashAndSalt(password, salt)).Replace("-", ""); + + Database.CreateUser(0, username, hashsalt, saltText, gender, true, true); + } + + // Start Web Server + cs = new ContentServer(); + string[] fileList = Directory.GetFiles(Path.Combine(baseDir, "client"), "*", SearchOption.AllDirectories); + foreach (string file in fileList) + addToList(file); + + // Start HI1 Server + Logger.SetCallback(Console.WriteLine); + Start.InitalizeAndStart(); + + // Start Flash (Windows) + Process p = new Process(); + p.StartInfo.FileName = Path.Combine(baseDir, "flash.dll"); + p.StartInfo.Arguments = "http://127.0.0.1:12515/horseisle.swf?SERVER=127.0.0.1&PORT=12321"; + p.Start(); + + while (true) { /* Allow asyncronous operations to happen. */ }; + + } + } +} diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/Linux64.pubxml new file mode 100644 index 0000000..e633e09 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/Linux64.pubxml @@ -0,0 +1,19 @@ + + + + + Linux + x64 + bin\x64\Linux\net6.0\linux-x64\publish\ + FileSystem + net6.0 + linux-x64 + True + True + True + True + OS_LINUX;ARCH_X86_64 + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/LinuxARM.pubxml new file mode 100644 index 0000000..8257770 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/LinuxARM.pubxml @@ -0,0 +1,19 @@ + + + + + Linux + ARM + bin\ARM\Linux\net6.0\linux-arm\publish\ + FileSystem + net6.0 + linux-arm + True + True + True + True + OS_LINUX;ARCH_ARM + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/LinuxARM64.pubxml new file mode 100644 index 0000000..b9c21d1 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/LinuxARM64.pubxml @@ -0,0 +1,19 @@ + + + + + Linux + ARM64 + bin\ARM64\Linux\net6.0\linux-arm64\publish\ + FileSystem + net6.0 + linux-arm64 + True + True + True + True + OS_LINUX;ARCH_ARM64 + + diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/Osx64.pubxml new file mode 100644 index 0000000..8e6230a --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/Osx64.pubxml @@ -0,0 +1,19 @@ + + + + + MacOS + x64 + bin\x64\MacOS\net6.0\osx-x64\publish\ + FileSystem + net6.0 + osx-x64 + True + True + True + True + OS_MACOS;ARCH_X86_64 + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/OsxARM64.pubxml new file mode 100644 index 0000000..bf66d06 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/OsxARM64.pubxml @@ -0,0 +1,19 @@ + + + + + MacOS + ARM64 + bin\arm64\MacOS\net6.0\osx-arm64\publish\ + FileSystem + net6.0 + osx-arm64 + True + True + True + True + OS_MACOS;ARCH_ARM64 + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win32.pubxml new file mode 100644 index 0000000..627bbac --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win32.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + x86 + bin\x86\Windows\net6.0\win-x86\publish\ + FileSystem + net6.0 + win-x86 + True + True + True + True + OS_WINDOWS;ARCH_X86 + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml new file mode 100644 index 0000000..b7888f5 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + x64 + bin\x64\Windows\net6.0\win-x64\publish\ + FileSystem + net6.0 + win-x64 + True + True + True + True + OS_WINDOWS;ARCH_X86_64 + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/WinARM.pubxml new file mode 100644 index 0000000..202b002 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/WinARM.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + ARM + bin\arm\Windows\net6.0\windows-arm\publish\ + FileSystem + net6.0 + win-arm + True + True + True + True + OS_WINDOWS;ARCH_ARM + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/N00BS/Properties/PublishProfiles/WinARM64.pubxml new file mode 100644 index 0000000..32dcdcb --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/WinARM64.pubxml @@ -0,0 +1,19 @@ + + + + + Windows + ARM64 + bin\arm64\Windows\net6.0\windows-arm64\publish\ + FileSystem + net6.0 + win-arm64 + True + True + True + True + OS_WINDOWS;ARCH_ARM64 + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/Resources.Designer.cs b/HorseIsleServer/N00BS/Properties/Resources.Designer.cs new file mode 100644 index 0000000..aecea91 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/Resources.Designer.cs @@ -0,0 +1,118 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace HISP.Properties { + using System; + + + /// + /// A strongly-typed resource public class, for looking up localized strings, etc. + /// + // This public class was auto-generated by the StronglyTypedResourceBuilder + // public class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this public class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HISP.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource public class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to <cross-domain-policy> + /// <allow-access-from domain="*" to-ports="12321" secure="false"/> + ///</cross-domain-policy>. + /// + internal static string DefaultCrossDomain { + get { + return ResourceManager.GetString("DefaultCrossDomain", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to # HorseIsleServer Default Configuration File + /// + ///# Ip address the server will bind to (default: 0.0.0.0 ALL INTERFACES) + ///ip=0.0.0.0 + ///# Port the server will bind to (default: 12321) + ///port=12321 + /// + ///# MariaDB Database + ///db_ip=127.0.0.1 + ///db_name=beta + ///db_username=root + ///db_password=test123 + ///db_port=3306 + /// + ///# Map Data + ///map=HI1.MAP + /// + ///# JSON Format Data + /// + ///gamedata=gamedata.json + /// + ///# Cross-Domain Policy File + ///crossdomain=CrossDomainPolicy.xml + /// + ///# Red Text Stating "Todays Note:" + ///motd=April 11, 2020. New breed, C [rest of string was truncated]";. + /// + internal static string DefaultServerProperties { + get { + return ResourceManager.GetString("DefaultServerProperties", resourceCulture); + } + } + + /// + /// UNKNOWN COMMIT HASH + /// + internal static string GitCommit { + get { + return ResourceManager.GetString("GitCommit", resourceCulture); + } + } + + } +} diff --git a/HorseIsleServer/N00BS/Properties/Resources.resx b/HorseIsleServer/N00BS/Properties/Resources.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/Resources.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/HorseIsleServer/N00BS/Properties/launchSettings.json b/HorseIsleServer/N00BS/Properties/launchSettings.json new file mode 100644 index 0000000..e6013fa --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "HISP": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/HorseIsleServer/N00BS/icon.ico b/HorseIsleServer/N00BS/icon.ico new file mode 100644 index 0000000..1c3ca8d Binary files /dev/null and b/HorseIsleServer/N00BS/icon.ico differ