Fix 2player for real

This reverts commit 78e08c2e63.

.github/workflows/build.yml

@@ -21,8 +21,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.100-preview.5.22307.18
-        include-prerelease: true
+        dotnet-version: 8.0.x
+        include-prerelease: false
     - name: Install utils
       run: |
         sudo apt update
@@ -33,7 +33,7 @@ jobs:
       run: |
         dotnet restore LibHISP
         dotnet restore HISPd
-# nativeaot linux x54
+# linux x64
     - name: Build linux-x64
       continue-on-error: false
       run: |
@@ -44,27 +44,14 @@ jobs:
         dotnet publish -p:PublishProfile=Linux64.pubxml
         cd ..
         
-# Currently broken ...
-
-#        dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
-#        cd HISPd
-#        dotnet publish -r linux-x64 -c Linux /p:Platform=x64 --self-contained
-#        cd ..
-#        mkdir -p HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata
-#        cp -r HISPd/bin/x64/Linux/net7.0/linux-x64/gamedata/* HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata
-#        cp HISPd/bin/x64/Linux/net7.0/linux-x64/HI1.MAP HISPd/bin/x64/Linux/net7.0/linux-x64/native/HI1.MAP
-#        cp HISPd/bin/x64/Linux/net7.0/linux-x64/publish/libe_sqlite3.so HISPd/bin/x64/Linux/net7.0/linux-x64/native/libe_sqlite3.so
-#        rm -f HISPd/bin/x64/Linux/net7.0/linux-x64/native/HISPd.dbg
-#        dotnet remove HISPd package Microsoft.DotNet.ILCompiler
-        
-        
+# linux arm
     - name: Build linux-arm
       continue-on-error: false
       run: |
         cd HISPd
         dotnet publish -p:PublishProfile=LinuxARM.pubxml
         cd ..
-# nativeaot linux arm64
+# linux arm64
     - name: Build linux-arm64
       continue-on-error: false
       run: |
@@ -72,18 +59,6 @@ jobs:
         dotnet publish -p:PublishProfile=LinuxARM64.pubxml
         cd ..
 
-#        dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
-#        dotnet add HISPd package runtime.linux-x64.Microsoft.DotNet.ILCompiler --prerelease
-#        cd HISPd
-#        dotnet publish -r linux-arm64 -c Linux /p:Platform=ARM64 --self-contained
-#        cd ..
-#        mkdir -p HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/gamedata
-#        cp -r HISPd/bin/ARM64/Linux/net7.0/linux-arm64/gamedata/* HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/gamedata
-#        cp HISPd/bin/ARM64/Linux/net7.0/linux-arm64/HI1.MAP HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/HI1.MAP
-#        cp HISPd/bin/ARM64/Linux/net7.0/linux-arm64/publish/libe_sqlite3.so HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/libe_sqlite3.so
-#        rm -f HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/HISPd.dbg
-#        dotnet remove HISPd package Microsoft.DotNet.ILCompiler
-#        dotnet remove HISPd package runtime.linux-x64.Microsoft.DotNet.ILCompiler
         
     - name: Build deb package
       continue-on-error: false
@@ -102,10 +77,10 @@ jobs:
         cp LibHISP/Resources/server.properties /tmp/debpkg/Debian64/etc/hisp/server.properties
         cp LibHISP/Resources/default_cross_domain.xml /tmp/debpkg/Debian64/etc/hisp/CrossDomainPolicy.xml
         cp -r HISPd/Resources/DEBIAN/* /tmp/debpkg/Debian64/DEBIAN
-        cp -r HISPd/bin/x64/Linux/net7.0/linux-x64/publish/gamedata/* /tmp/debpkg/Debian64/etc/hisp/gamedata
-        cp HISPd/bin/x64/Linux/net7.0/linux-x64/publish/libe_sqlite3.so /tmp/debpkg/Debian64/usr/lib/libe_sqlite3.so
-        cp HISPd/bin/x64/Linux/net7.0/linux-x64/publish/HI1.MAP /tmp/debpkg/Debian64/etc/hisp/HI1.MAP
-        cp HISPd/bin/x64/Linux/net7.0/linux-x64/publish/HISPd /tmp/debpkg/Debian64/usr/bin/HISPd
+        cp -r HISPd/bin/x64/Linux/net8.0/linux-x64/publish/gamedata/* /tmp/debpkg/Debian64/etc/hisp/gamedata
+        cp HISPd/bin/x64/Linux/net8.0/linux-x64/publish/libe_sqlite3.so /tmp/debpkg/Debian64/usr/lib/libe_sqlite3.so
+        cp HISPd/bin/x64/Linux/net8.0/linux-x64/publish/HI1.MAP /tmp/debpkg/Debian64/etc/hisp/HI1.MAP
+        cp HISPd/bin/x64/Linux/net8.0/linux-x64/publish/HISPd /tmp/debpkg/Debian64/usr/bin/HISPd
         cp HISPd/Resources/HISP.service /tmp/debpkg/Debian64/etc/systemd/system/HISP.service
         cat /tmp/debpkg/Debian64/DEBIAN/control
         dos2unix /tmp/debpkg/Debian64/DEBIAN/conffiles
@@ -120,60 +95,33 @@ jobs:
         dpkg-deb --build /tmp/debpkg/Debian64
         mv /tmp/debpkg/Debian64.deb debpackage/HISP-Debian-AMD64.deb
         
-        
-#android .. maybe someday
-
-#    - name: Build android-arm
-#      continue-on-error: false
-#      run: |
-#        dotnet publish -p:PublishProfile=AndroidARM.pubxml
-
-#    - name: Build android-arm64
-#      continue-on-error: false
-#      run: |
-#        dotnet publish -p:PublishProfile=AndroidARM64.pubxml
-
-
-#    - name: Upload android-arm
-#      uses: actions/upload-artifact@v2
-#      with:
-#        name: HISP-AndroidARM
-#        path: HorseIsleServer/HISPd/bin/arm/Android/net7.0/android-arm/publish/
-
-#    - name: Upload android-arm64
-#      uses: actions/upload-artifact@v2
-#      with:
-#        name: HISP-AndroidARM64
-#        path: HorseIsleServer/HISPd/bin/arm64/Android/net7.0/android-arm64/publish/
-
-
 # Upload LINUX
     - name: Upload linux-x64
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Linux64
-        path: HorseIsleServer/HISPd/bin/x64/Linux/net7.0/linux-x64/publish/
+        path: HorseIsleServer/HISPd/bin/x64/Linux/net8.0/linux-x64/publish/
 
     - name: Upload linux-x64-noobs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Linux64-Noobs
-        path: HorseIsleServer/MPN00BS/bin/x64/Linux/net7.0/linux-x64/publish/
+        path: HorseIsleServer/MPN00BS/bin/x64/Linux/net8.0/linux-x64/publish/
 
     - name: Upload linux-arm
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-LinuxARM
-        path: HorseIsleServer/HISPd/bin/ARM/Linux/net7.0/linux-arm/publish/
+        path: HorseIsleServer/HISPd/bin/ARM/Linux/net8.0/linux-arm/publish/
     
     - name: Upload linux-arm64
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-LinuxARM64
-        path: HorseIsleServer/HISPd/bin/ARM64/Linux/net7.0/linux-arm64/publish/
+        path: HorseIsleServer/HISPd/bin/ARM64/Linux/net8.0/linux-arm64/publish/
 
     - name: Upload deb package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-DebianPackage
         path: HorseIsleServer/debpackage
@@ -191,8 +139,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.100-preview.5.22307.18
-        include-prerelease: true
+        dotnet-version: 8.0.x
+        include-prerelease: false
     
     - name: Install utils
       run: dotnet tool install -g dotnet-script
@@ -200,7 +148,7 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore
 
-#nativeaot x64 build
+# x64 build
     - name: Build win-x64
       continue-on-error: false
       run: |
@@ -211,21 +159,6 @@ jobs:
         dotnet publish -p:PublishProfile=Win64.pubxml
         cd ..
 
-#        dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
-#        cd HISPd
-#        dotnet publish -r win-x64 -c Windows /p:Platform=x64 --self-contained
-#        cd ..
-#        mkdir "HISPd\bin\x64\Windows\net7.0\win-x64\native\gamedata"
-#        copy "..\HorseIsleData\gamedata\*" "HISPd\bin\x64\Windows\net7.0\win-x64\native\gamedata"
-#        copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\x64\Windows\net7.0\win-x64\native\HI1.MAP"
-#        copy "HISPd\bin\x64\Windows\net7.0\win-x64\publish\e_sqlite3.dll" "HISPd\bin\x64\Windows\net7.0\win-x64\native\e_sqlite3.dll"
-#        del "HISPd\bin\x64\Windows\net7.0\win-x64\native\HISPd.pdb"
-#        del "HISPd\bin\x64\Windows\net7.0\win-x64\native\HISPd.lib"
-#        del "HISPd\bin\x64\Windows\net7.0\win-x64\native\HISPd.exp"
-#        dotnet remove HISPd package Microsoft.DotNet.ILCompiler
-#        cd N00BS
-#        dotnet publish -p:PublishProfile=Win64.pubxml
-#        cd ..
     - name: Build win-x86
       continue-on-error: false
       run: |
@@ -235,72 +168,46 @@ jobs:
         cd MPN00BS
         dotnet publish -p:PublishProfile=Win32.pubxml
         cd ..
-    - name: Build win-arm
-      continue-on-error: false
-      run: |
-        cd HISPd
-        dotnet publish -p:PublishProfile=WinARM.pubxml
-        cd ..
-#nativeaot arm64 build
+
+# arm64 build
     - name: Build win-arm64
       continue-on-error: false
       run: |
         cd HISPd
         dotnet publish -p:PublishProfile=WinARM64.pubxml
         cd ..
-#        dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
-#        dotnet add HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler --prerelease
-#        cd HISPd
-#        dotnet publish -r win-arm64 -c Windows /p:Platform=ARM64  --self-contained
-#        cd ..
-#        mkdir "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\gamedata"
-#        copy "..\HorseIsleData\gamedata\*" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\gamedata"
-#        copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HI1.MAP"
-#        copy "HISPd\bin\ARM64\Windows\net7.0\win-arm64\publish\e_sqlite3.dll" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\e_sqlite3.dll"
-#        del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.pdb"
-#        del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.lib"
-#        del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.exp"
-#        dotnet remove HISPd package Microsoft.DotNet.ILCompiler
-#        dotnet remove HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler
-
 
 # Upload WINDOWS
 
     - name: Upload win-x64
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Win64
-        path: HorseIsleServer/HISPd/bin/x64/Windows/net7.0/win-x64/publish/
+        path: HorseIsleServer/HISPd/bin/x64/Windows/net8.0/win-x64/publish/
     
     - name: Upload win-x86
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Win32
-        path: HorseIsleServer/HISPd/bin/x86/Windows/net7.0/win-x86/publish/
+        path: HorseIsleServer/HISPd/bin/x86/Windows/net8.0/win-x86/publish/
         
-    - name: Upload win-arm
-      uses: actions/upload-artifact@v2
-      with:
-        name: HISP-WinARM
-        path: HorseIsleServer/HISPd/bin/arm/Windows/net7.0/win-arm/publish/
-
     - name: Upload win-arm64
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-WinARM64
-        path: HorseIsleServer/HISPd/bin/arm64/Windows/net7.0/win-arm64/publish/
+        path: HorseIsleServer/HISPd/bin/arm64/Windows/net8.0/win-arm64/publish/
 
     - name: Upload win-x86-noobs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Win32-Noobs
-        path: HorseIsleServer/MPN00BS/bin/x86/Windows/net7.0/win-x86/publish/
+        path: HorseIsleServer/MPN00BS/bin/x86/Windows/net8.0/win-x86/publish/
 
     - name: Upload win-x64-noobs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Win64-Noobs
-        path: HorseIsleServer/MPN00BS/bin/x64/Windows/net7.0/win-x64/publish/
+        path: HorseIsleServer/MPN00BS/bin/x64/Windows/net8.0/win-x64/publish/
 
   build-mac:
     runs-on: ubuntu-latest
@@ -315,8 +222,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.100-preview.5.22307.18
-        include-prerelease: true
+        dotnet-version: 8.0.x
+        include-prerelease: false
         
     - name: Install utils
       run: dotnet tool install -g dotnet-script
@@ -332,6 +239,9 @@ jobs:
         cd HISPd
         dotnet publish -p:PublishProfile=Osx64.pubxml
         cd ..
+        cd MPN00BS
+        dotnet publish -p:PublishProfile=Osx64.pubxml
+        cd ..
     - name: Build mac-arm64
       continue-on-error: false
       run: |
@@ -339,17 +249,23 @@ jobs:
         dotnet publish -p:PublishProfile=OsxARM64.pubxml
         cd ..
     - name: Upload mac-x64
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Mac64
-        path: HorseIsleServer/HISPd/bin/x64/MacOS/net7.0/osx-x64/publish/
+        path: HorseIsleServer/HISPd/bin/x64/MacOS/net8.0/osx-x64/publish/
 
     - name: Upload mac-arm64
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-MacARM64
-        path: HorseIsleServer/HISPd/bin/arm64/MacOS/net7.0/osx-arm64/publish/
+        path: HorseIsleServer/HISPd/bin/arm64/MacOS/net8.0/osx-arm64/publish/
         
+    - name: Upload mac-x64-noobs
+      uses: actions/upload-artifact@v4
+      with:
+        name: HISP-Mac-Noobs
+        path: HorseIsleServer/MPN00BS/bin/x64/MacOS/net8.0/osx-x64/publish/
+
   build-web:
     runs-on: ubuntu-latest
     steps:
@@ -363,13 +279,13 @@ jobs:
     # UPLOAD WEB
 
     - name: Upload Website (master)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Web-Master
         path: HorseIsleWeb/master-site
         
     - name: Upload Website (game)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: HISP-Web-Game
         path: HorseIsleWeb/game-site

.gitignore

@@ -4,6 +4,12 @@
 *.log
 *.suo
 *.csproj.user
+*.pubxml.user
+*.user
+*.idb
+
+*Thumbs.db
+*.DS_Store
 
 HorseIsleServer/N00BS/obj/*
 HorseIsleServer/N00BS/bin/*
@@ -14,10 +20,15 @@ HorseIsleServer/MPN00BS/bin/*
 HorseIsleServer/HISPd/obj/*
 HorseIsleServer/HISPd/bin/*
 
-HorseIsleServer/Installer/Windows/*
+HorseIsleServer/HISPtests/obj/*
+HorseIsleServer/HISPtests/bin/*
+
 
 HorseIsleServer/LibHISP/obj/*
 HorseIsleServer/LibHISP/bin/*
 HorseIsleServer/LibHISP/Resources/Versioning/*
 
+HorseIsleServer/Installer/Windows/*
+
+
 HorseIsleServer/.vs/*

HorseIsleData

@@ -1 +1 @@
-Subproject commit 0afb5924fd3d0b83e6a1369789b1b98255374183
+Subproject commit e9c09c77cd0dd99eb12e16b679478fb0e3742b55

HorseIsleServer/HISP.sln

@@ -8,9 +8,8 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HISPd", "HISPd\HISPd.csproj", "{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPN00BS", "MPN00BS\MPN00BS.csproj", "{72EF95FC-03DB-4E61-A696-E0095DD42A4E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C48CBD82-AB30-494A-8FFA-4DE7069B5827} = {C48CBD82-AB30-494A-8FFA-4DE7069B5827}
-	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HISPtests", "HISPtests\HISPtests.csproj", "{689FB972-1612-440E-817D-BE290F655AA8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +38,11 @@ Global
 		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
@@ -95,6 +99,16 @@ Global
 		{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 = Windows|Any CPU
+		{C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|Any CPU.Build.0 = Windows|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 = Windows|x86
+		{C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|x86.Build.0 = Windows|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
@@ -154,6 +168,16 @@ Global
 		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|x64.Build.0 = MacOS|x64
 		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|x86.ActiveCfg = MacOS|x86
 		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.MacOS|x86.Build.0 = MacOS|x86
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|Any CPU.ActiveCfg = Windows|Any CPU
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|Any CPU.Build.0 = Windows|Any CPU
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM.ActiveCfg = Windows|ARM
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM.Build.0 = Windows|ARM
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM64.ActiveCfg = Windows|ARM64
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|ARM64.Build.0 = Windows|ARM64
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x64.ActiveCfg = Windows|x64
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x64.Build.0 = Windows|x64
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x86.ActiveCfg = Windows|x86
+		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Release|x86.Build.0 = Windows|x86
 		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
 		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|Any CPU.Build.0 = Windows|Any CPU
 		{DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Windows|ARM.ActiveCfg = Windows|ARM
@@ -214,6 +238,16 @@ Global
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.MacOS|x64.Build.0 = MacOS|x64
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.MacOS|x86.ActiveCfg = MacOS|x86
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.MacOS|x86.Build.0 = MacOS|x86
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|Any CPU.ActiveCfg = Windows|Any CPU
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|Any CPU.Build.0 = Windows|Any CPU
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|ARM.ActiveCfg = Windows|ARM
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|ARM.Build.0 = Windows|ARM
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|ARM64.ActiveCfg = Windows|ARM64
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|ARM64.Build.0 = Windows|ARM64
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|x64.ActiveCfg = Windows|x64
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|x64.Build.0 = Windows|x64
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|x86.ActiveCfg = Windows|x86
+		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Release|x86.Build.0 = Windows|x86
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Windows|Any CPU.Build.0 = Windows|Any CPU
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Windows|ARM.ActiveCfg = Windows|ARM
@@ -224,6 +258,76 @@ Global
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Windows|x64.Build.0 = Windows|x64
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Windows|x86.ActiveCfg = Windows|x86
 		{72EF95FC-03DB-4E61-A696-E0095DD42A4E}.Windows|x86.Build.0 = Windows|x86
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|Any CPU.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|Any CPU.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|ARM.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|ARM.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|ARM64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|ARM64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|x64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|x64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|x86.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Android|x86.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|ARM.ActiveCfg = Debug|ARM
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|ARM.Build.0 = Debug|ARM
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|ARM64.Build.0 = Debug|ARM64
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|x64.ActiveCfg = Debug|x64
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|x64.Build.0 = Debug|x64
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|x86.ActiveCfg = Debug|x86
+		{689FB972-1612-440E-817D-BE290F655AA8}.Debug|x86.Build.0 = Debug|x86
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|Any CPU.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|ARM.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|ARM.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|ARM64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|ARM64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|x64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|x64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|x86.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.iOS|x86.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|Any CPU.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|Any CPU.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|ARM.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|ARM.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|ARM64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|ARM64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|x64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|x64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|x86.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Linux|x86.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|Any CPU.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|ARM.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|ARM.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|ARM64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|ARM64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|x64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|x64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|x86.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.MacOS|x86.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|ARM.ActiveCfg = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|ARM.Build.0 = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|ARM64.Build.0 = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|x64.ActiveCfg = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|x64.Build.0 = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|x86.ActiveCfg = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Release|x86.Build.0 = Release|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|Any CPU.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|ARM.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|ARM.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|ARM64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|ARM64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|x64.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|x64.Build.0 = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|x86.ActiveCfg = Debug|Any CPU
+		{689FB972-1612-440E-817D-BE290F655AA8}.Windows|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

HorseIsleServer/HISPd/HISPd.csproj

@@ -27,7 +27,7 @@
     <GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NoWin32Manifest>true</NoWin32Manifest>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -44,7 +44,13 @@
     <WarningLevel>3</WarningLevel>
     <NoWarn>1701;1702;2026;IL2026</NoWarn>
   </PropertyGroup>
-    
+  <PropertyGroup>
+  	
+	<TrimMode>partial</TrimMode>
+	<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+	<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
+	
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x86'">
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <Optimize>true</Optimize>
@@ -152,112 +158,12 @@
   </PropertyGroup>
 
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_ARM</DefineConstants>
-    <DebugType>none</DebugType>
+    <DefineConstants>DEBUG;TRACE;OS_DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
   </PropertyGroup>
 
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_ARM64</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_X86_64</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE;OS_DEBUG;ARCH_X86</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|x86'">
-    <Optimize>True</Optimize>
-    <DefineConstants>OS_MACOS;ARCH_X86</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|x86'">
-    <Optimize>True</Optimize>
-    <DefineConstants>OS_LINUX;ARCH_X86</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|AnyCPU'">
-    <Optimize>False</Optimize>
-    <DefineConstants>OS_LINUX;ARCH_ANYCPU</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|AnyCPU'">
-    <Optimize>False</Optimize>
-    <DefineConstants>OS_WINDOWS;ARCH_ANYCPU</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|AnyCPU'">
-    <Optimize>False</Optimize>
-    <DefineConstants>OS_MACOS;ARCH_ANYCPU</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|ARM'">
-    <Optimize>True</Optimize>
-    <DefineConstants>OS_MACOS;ARCH_ARM</DefineConstants>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <WarningLevel>3</WarningLevel>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Android|x64'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='iOS|x64'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Android|x86'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='iOS|x86'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Android|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='iOS|AnyCPU'">
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-
 
 </Project>

HorseIsleServer/HISPd/Program.cs

@@ -11,7 +11,7 @@ namespace HISP.Cli
         private static StreamWriter sw = null;
         private static FileStream fs = null;
         private static string logFile;
-        private static EventWaitHandle shutdownHandle;
+        private static EventWaitHandle shutdownHandle = null;
 
         public static bool ShuttingDown = false;
         public static string BaseDir;
@@ -44,46 +44,95 @@ namespace HISP.Cli
 
         public static void OnShutdown()
         {
-            shutdownHandle.Set();
+            try
+            {
+                if (sw != null)
+                {
+                    sw.Flush();
+                    sw.Close();
+                    sw.Dispose();
+                    sw = null;
+                }
+
+            }
+            catch (Exception) { };
+
+            try
+            {
+                if (fs != null)
+                {
+                    fs.Flush();
+                    fs.Close();
+                    fs.Dispose();
+                    fs = null;
+                }
+            }
+            catch (Exception) { };
+
+
+            if(shutdownHandle != null)
+                shutdownHandle.Set();
         }
+
+        private static string formatMessage(string type, string text, bool console)
+        {
+#if OS_WINDOWS
+            string newline = "\r\n";
+#else
+            string newline = "\n";
+#endif
+
+            string msg = DateTime.Now.ToString("MM-dd-yyyy HH:mm:ss") + ": [" + type + "] ";
+            if (console && text.Length > (Console.WindowWidth - msg.Length) - newline.Length)
+                text = text.Substring(0, (Console.WindowWidth - msg.Length) - newline.Length);
+
+            return msg + text + newline;
+        }
+
         public static void LogToFile(bool error, string type,string text)
         {
-            sw.WriteLineAsync(DateTime.Now.ToString("MM-dd-YYYY HH:mm:dd") + ": [" + type + "] " + text + sw.NewLine);
+            sw.WriteLine(formatMessage(type, text, false));
+            if (error)
+                sw.Flush();
         }
         public static void LogStdout(bool error, string type, string text)
         {
             if (type == "CRASH")
                 LogToFile(error, type, text);
-
-            if (error)
-                Console.Error.WriteAsync(DateTime.Now.ToString("MM-dd-YYYY HH:mm:dd")+": [" + type + "] " + text + Console.Error.NewLine);
-            else
-                Console.Out.WriteAsync(DateTime.Now.ToString("MM-dd-YYYY HH:mm:dd") + ": [" + type + "] " + text + Console.Out.NewLine);
-            
+            try
+            {
+                if (error)
+                    Console.Error.WriteAsync(formatMessage(type, text, true));
+                else
+                    Console.Out.WriteAsync(formatMessage(type, text, true));
+                
+            }
+            catch (Exception) { };
         }
 
         public static void Main(string[] args)
         {
             AppDomain.CurrentDomain.ProcessExit += ProcessQuitHandler;
 
-            string BaseDir = Directory.GetCurrentDirectory();
+            string baseDir = Directory.GetCurrentDirectory();
             Logger.SetCallback(LogStdout);
+            Entry.SetShutdownCallback(OnShutdown);
 
-            string HispConfVar = Environment.GetEnvironmentVariable("HISP_CONF_FILE");
-            string HispLogVar = Environment.GetEnvironmentVariable("HISP_LOG_FILE");
-            string HispBaseDir = Environment.GetEnvironmentVariable("HISP_BASE_DIR");
+            string hispConfVar = Environment.GetEnvironmentVariable("HISP_CONF_FILE");
+            string hispLogVar = Environment.GetEnvironmentVariable("HISP_LOG_FILE");
+            string hispBaseDir = Environment.GetEnvironmentVariable("HISP_BASE_DIR");
 
             foreach (string arg in args)
             {
                 switch (arg)
                 {
                     case "--install-service":
-                        #if OS_LINUX
+#if OS_LINUX
                         File.WriteAllBytes("/etc/systemd/system/HISP.service", Resources.HISPService);
                         LogStdout(false, "INFO", "Crreated Service! enable it with \"sudo systemctl enable HISP\"");
-                        #else
+#else
                         LogStdout(true, "ERROR", "Installing as a service unsupported on this platform");
-                        #endif
+#endif
                         break;
                     default:
                         if (arg.Contains("="))
@@ -101,8 +150,8 @@ namespace HISP.Cli
                                         Logger.SetCallback(LogToFile);
                                         break;
                                     case "--base-directory":
-                                        BaseDir = argu[1];
-                                        Directory.SetCurrentDirectory(BaseDir);
+                                        baseDir = argu[1];
+                                        Directory.SetCurrentDirectory(baseDir);
                                         break;
                                     default:
                                         continue;
@@ -113,28 +162,27 @@ namespace HISP.Cli
                 }
             }
 
-            if (HispConfVar != null)
+            if (hispConfVar != null)
             {
-                ConfigReader.ConfigurationFileName = HispConfVar;
+                ConfigReader.ConfigurationFileName = hispConfVar;
             }
             
-            if (HispLogVar != null)
+            if (hispLogVar != null)
             {
-                LogFile = HispLogVar;
+                LogFile = hispLogVar;
                 Logger.SetCallback(LogToFile);
             }
             else
             {
-                LogFile = Path.Combine(BaseDir, "crash.log");
+                LogFile = Path.Combine(baseDir, "crash.log");
             }
 
-            if (HispBaseDir != null)
+            if (hispBaseDir != null)
             {
-                BaseDir = HispBaseDir;
-                Directory.SetCurrentDirectory(BaseDir);
+                baseDir = hispBaseDir;
+                Directory.SetCurrentDirectory(baseDir);
             }
 
-            Entry.SetShutdownCallback(OnShutdown);
             Entry.Start();
 
             shutdownHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
@@ -143,7 +191,7 @@ namespace HISP.Cli
 
         private static void ProcessQuitHandler(object sender, EventArgs e)
         {
-            GameServer.ShutdownServer();
+            GameServer.ShutdownServer("HISPd process quitting.");
         }
     }
 }

HorseIsleServer/HISPd/Properties/AssemblyInfo.cs

@@ -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.7.140.0")]
-[assembly: AssemblyFileVersion("1.7.140.0")]
+[assembly: AssemblyVersion("1.8.73.0")]
+[assembly: AssemblyFileVersion("1.8.73.0")]

HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Android</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\arm\Android\net7.0\android-arm\publish\</PublishDir>
+    <PublishDir>bin\arm\Android\net8.0\android-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>android-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <UseAppHost>True</UseAppHost>

HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Android</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\Android\net7.0\android-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\Android\net8.0\android-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>android-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <UseAppHost>True</UseAppHost>

HorseIsleServer/HISPd/Properties/PublishProfiles/Linux64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\Linux\net7.0\linux-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\Linux\net8.0\linux-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/LinuxARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\ARM\Linux\net7.0\linux-arm\publish\</PublishDir>
+    <PublishDir>bin\ARM\Linux\net8.0\linux-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/LinuxARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\ARM64\Linux\net7.0\linux-arm64\publish\</PublishDir>
+    <PublishDir>bin\ARM64\Linux\net8.0\linux-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/Osx64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>MacOS</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\MacOS\net7.0\osx-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\MacOS\net8.0\osx-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/OsxARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>MacOS</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\MacOS\net7.0\osx-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\MacOS\net8.0\osx-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/Win32.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>x86</Platform>
-    <PublishDir>bin\x86\Windows\net7.0\win-x86\publish\</PublishDir>
+    <PublishDir>bin\x86\Windows\net8.0\win-x86\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml

@@ -6,14 +6,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\Windows\net7.0\win-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\Windows\net8.0\win-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
+    <PublishTrimmed>True</PublishTrimmed>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>True</PublishReadyToRun>
-    <PublishTrimmed>True</PublishTrimmed>
 	<DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>
   </PropertyGroup>
 </Project>

HorseIsleServer/HISPd/Properties/PublishProfiles/WinARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\arm\Windows\net7.0\win-arm\publish\</PublishDir>
+    <PublishDir>bin\arm\Windows\net8.0\win-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/WinARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\Windows\net7.0\win-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\Windows\net8.0\win-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>iOS</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\arm\iOS\net7.0\ios-arm\publish\</PublishDir>
+    <PublishDir>bin\arm\iOS\net8.0\ios-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>ios-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>iOS</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\iOS\net7.0\ios-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\iOS\net8.0\ios-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

HorseIsleServer/HISPd/Resources/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: hisp
-Version: 1.7.140
+Version: 1.8.73
 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
 Maintainer: Li
 Homepage: https://islehorse.com

HorseIsleServer/HISPd/Resources/HISP.service

@@ -16,8 +16,8 @@ Type=simple
 ProtectSystem=full
 PrivateDevices=true
 
-StandardError=syslog+console
-StandardOutput=syslog+console
+StandardError=journal+console
+StandardOutput=journal+console
 
 User=horseisle
 Group=horseisle

HorseIsleServer/HISPtests/HISPtests.csproj

@@ -0,0 +1,169 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>HISP.Tests</RootNamespace>
+    <LangVersion>10.0</LangVersion>
+    <Platforms>x64;x86;ARM;ARM64;AnyCPU</Platforms>
+    <Configurations>Debug;Windows;Linux;MacOS;Android;iOS</Configurations>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\LibHISP\LibHISP.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <NoWin32Manifest>true</NoWin32Manifest>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
+    <StartupObject>HISP.Tests.Program</StartupObject>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <DebugType>embedded</DebugType>
+    <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
+    <AnalysisLevel>none</AnalysisLevel>
+    <EnableNETAnalyzers>False</EnableNETAnalyzers>
+    <Copyright>Public Domain, 2022</Copyright>
+    <PackageProjectUrl>https://islehorse.com</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/islehorse/HISP</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <WarningLevel>3</WarningLevel>
+    <NoWarn>1701;1702;2026;IL2026</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+
+    <TrimMode>partial</TrimMode>
+    <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+    <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
+
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x86'">
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <Platforms>x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
+    <DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x64'">
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <Platforms>x64</Platforms>
+    <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|ARM'">
+    <RuntimeIdentifier>win-arm</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>ARM</PlatformTarget>
+    <DefineConstants>OS_WINDOWS;ARCH_ARM</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|ARM64'">
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <DefineConstants>OS_WINDOWS;ARCH_ARM64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Android|ARM'">
+    <RuntimeIdentifier>android-arm</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>ARM</PlatformTarget>
+    <DefineConstants>OS_ANDROID;ARCH_ARM</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <NoWarn></NoWarn>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Android|ARM64'">
+    <RuntimeIdentifier>android-arm64</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <DefineConstants>OS_ANDROID;ARCH_ARM64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|x64'">
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM'">
+    <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
+    <PlatformTarget>ARM</PlatformTarget>
+    <Optimize>true</Optimize>
+    <DefineConstants>OS_LINUX;ARCH_ARM</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux|ARM64'">
+    <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <Optimize>true</Optimize>
+    <DefineConstants>OS_LINUX;ARCH_ARM64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|x64'">
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>OS_MACOS;ARCH_X86_64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MacOS|ARM64'">
+    <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <DefineConstants>OS_MACOS;ARCH_ARM64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='iOS|ARM'">
+    <RuntimeIdentifier>ios-arm</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>ARM</PlatformTarget>
+    <DefineConstants>OS_IOS;ARCH_ARM</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='iOS|ARM64'">
+    <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
+    <Optimize>true</Optimize>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <DefineConstants>OS_IOS;ARCH_ARM64</DefineConstants>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|AnyCPU'">
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    <Optimize>True</Optimize>
+    <DefineConstants>OS_ALL;ARCH_ANYCPU</DefineConstants>
+  </PropertyGroup>
+
+
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE;OS_DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+
+
+
+</Project>

HorseIsleServer/HISPtests/Program.cs

@@ -0,0 +1,20 @@
+using HISP.Server;
+using HISP.Tests.UnitTests;
+using System;
+using System.Threading.Tasks;
+
+namespace HISP.Tests
+{
+    public static class Program
+    {
+
+        public static async Task Main(string[] args)
+        {
+            ServerStartTest.RunServerStartTest();
+            AuthenticationTest.RunAuthenticationTest();
+            await UserTest.RunUserTest();
+            PacketTest.RunPacketTest();
+        }
+    }
+
+}

HorseIsleServer/HISPtests/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("HISPd")]
+[assembly: AssemblyDescription("Server Emulator for \"Horse Isle\"")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Li")]
+[assembly: AssemblyProduct("HISP")]
+[assembly: AssemblyCopyright("Public Domain <20> 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("57264c6b-1461-41d6-9304-3890cf6c8390")]
+
+// 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.8.30.0")]
+[assembly: AssemblyFileVersion("1.8.30.0")]

HorseIsleServer/HISPtests/Properties/PublishProfiles/AndroidARM.pubxml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>Android</Configuration>
+    <Platform>ARM</Platform>
+    <PublishDir>bin\arm\Android\net8.0\android-arm\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>android-arm</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <UseAppHost>True</UseAppHost>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_ANDROID;ARCH_ARM</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/AndroidARM64.pubxml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>Android</Configuration>
+    <Platform>ARM64</Platform>
+    <PublishDir>bin\arm64\Android\net8.0\android-arm64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>android-arm64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <UseAppHost>True</UseAppHost>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_ANDROID;ARCH_ARM64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/Linux64.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>Linux</Configuration>
+    <Platform>x64</Platform>
+    <PublishDir>bin\x64\Linux\net8.0\linux-x64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_LINUX;ARCH_X86_64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/LinuxARM.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>Linux</Configuration>
+    <Platform>ARM</Platform>
+    <PublishDir>bin\ARM\Linux\net8.0\linux-arm\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_LINUX;ARCH_ARM</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/LinuxARM64.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>Linux</Configuration>
+    <Platform>ARM64</Platform>
+    <PublishDir>bin\ARM64\Linux\net8.0\linux-arm64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_LINUX;ARCH_ARM64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/Osx64.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>MacOS</Configuration>
+    <Platform>x64</Platform>
+    <PublishDir>bin\x64\MacOS\net8.0\osx-x64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_MACOS;ARCH_X86_64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/OsxARM64.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>MacOS</Configuration>
+    <Platform>ARM64</Platform>
+    <PublishDir>bin\arm64\MacOS\net8.0\osx-arm64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_MACOS;ARCH_ARM64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/Win32.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Windows</Configuration>
+    <Platform>x86</Platform>
+    <PublishDir>bin\x86\Windows\net8.0\win-x86\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+	<DefineConstants>OS_WINDOWS;ARCH_X86</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/Win64.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>Windows</Configuration>
+    <Platform>x64</Platform>
+    <PublishDir>bin\x64\Windows\net8.0\win-x64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishTrimmed>True</PublishTrimmed>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+	<DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/WinARM.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Windows</Configuration>
+    <Platform>ARM</Platform>
+    <PublishDir>bin\arm\Windows\net8.0\win-arm\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>win-arm</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_WINDOWS;ARCH_ARM</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/WinARM64.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Windows</Configuration>
+    <Platform>ARM64</Platform>
+    <PublishDir>bin\arm64\Windows\net8.0\win-arm64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_WINDOWS;ARCH_ARM64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/iOSARM.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>iOS</Configuration>
+    <Platform>ARM</Platform>
+    <PublishDir>bin\arm\iOS\net8.0\ios-arm\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>ios-arm</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_IOS;ARCH_ARM</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/PublishProfiles/iOSARM64.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration>iOS</Configuration>
+    <Platform>ARM64</Platform>
+    <PublishDir>bin\arm64\iOS\net8.0\ios-arm64\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+    <DefineConstants>OS_IOS;ARCH_ARM64</DefineConstants>
+  </PropertyGroup>
+</Project>

HorseIsleServer/HISPtests/Properties/Resources.Designer.cs

@@ -0,0 +1,74 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     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.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace HISP.Tests.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // 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", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public 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() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HISP.Tests.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {
+        ///  &quot;2PlayerClose&quot;: &quot;UFgA&quot;,
+        ///  &quot;BirdMap_OutsideMapTop&quot;: &quot;dgEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ [rest of string was truncated]&quot;;.
+        /// </summary>
+        public static string PacketTestDataSet {
+            get {
+                return ResourceManager.GetString("PacketTestDataSet", resourceCulture);
+            }
+        }
+    }
+}

HorseIsleServer/HISPtests/Properties/Resources.resx

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="PacketTestDataSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PacketTestDataSet.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+</root>

HorseIsleServer/HISPtests/Properties/launchSettings.json

@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "HISPtests": {
+      "commandName": "Project"
+    }
+  }
+}

HorseIsleServer/HISPtests/ResultLogger.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HISP.Tests
+{
+    public class ResultLogger
+    {
+        public static void LogTestStatus(bool successful, string testname, string message)
+        {
+            if (successful)
+            {
+                Console.ForegroundColor = ConsoleColor.Cyan;
+                Console.Out.Write("[ " + testname + " ] ");
+
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.Out.WriteLine("* " + message + " *");
+            }
+            else
+            {
+                Console.ForegroundColor = ConsoleColor.Cyan;
+                Console.Error.Write("[ " + testname + " ] ");
+
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.Error.WriteLine("* " + message + " *");
+            }
+        }
+
+        public static void LogTestResult(bool successful, string testname, string message, string expected)
+        {
+            if (successful)
+            {
+                Console.ForegroundColor = ConsoleColor.Cyan;
+                Console.Out.Write("[ " + testname + " ] ");
+
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.Out.WriteLine("* " + message + " == " + expected + " *");
+            }
+            else
+            {
+                Console.ForegroundColor = ConsoleColor.Cyan;
+                Console.Error.Write("[ " + testname + " ] ");
+
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.Error.WriteLine("* " + message + " != " + expected + " *");
+            }
+        }
+    }
+}

HorseIsleServer/HISPtests/UnitTests/AuthenticationTest.cs

@@ -0,0 +1,59 @@
+using HISP.Security;
+using HISP.Util;
+using System.Collections.Generic;
+
+namespace HISP.Tests.UnitTests
+{
+    public class AuthenticationTest
+    {
+
+        private const string ALLOWED_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890";
+        public static bool Test(string testName, object value, object valueComp)
+        {
+            bool result = value.Equals(valueComp);
+            if (result)
+                ResultLogger.LogTestStatus(true, "AUTH_TEST " + testName, "Success.");
+            else
+                ResultLogger.LogTestResult(false, "AUTH_TEST " + testName, value.ToString(), valueComp.ToString());
+
+            return result;
+        }
+
+        public static bool RunAuthenticationTest()
+        {
+            List<bool> results = new List<bool>();
+
+            // Test Login Encrypt/Decrypt
+            for(int i = 0; i <= 100; i++)
+            {
+                string rngStr = Helper.RandomString(ALLOWED_CHARS);
+                string cipherText = Authentication.EncryptLogin(rngStr);
+                string plainText = Authentication.DecryptLogin(cipherText);
+
+                results.Add(Test("LoginEncryptDecrypt" + i.ToString(), plainText, rngStr));
+            
+            }
+
+
+            string username = Helper.RandomString(ALLOWED_CHARS);
+            string password = Helper.RandomString(ALLOWED_CHARS);
+            
+            string wrongPassword = Helper.RandomString(ALLOWED_CHARS);
+            string wrongUsername = Helper.RandomString(ALLOWED_CHARS);
+
+            Authentication.CreateAccount(username, password, "DEMIGIRL", true, true);
+
+            // Test Login function
+            results.Add(Test("CorrectUsernameAndPassword", Authentication.CheckPassword(username, password), true));
+            results.Add(Test("CorrectUsernameWrongPassword", Authentication.CheckPassword(username, wrongPassword), false));
+            results.Add(Test("WrongPasswordAndUsername", Authentication.CheckPassword(wrongUsername, wrongPassword), false));
+            results.Add(Test("WrongUsernameCorrectPassword", Authentication.CheckPassword(wrongUsername, password), false));
+
+
+            foreach (bool result in results)
+                if (!result)
+                    return false;
+            return true;
+        }
+    }
+}

HorseIsleServer/HISPtests/UnitTests/PacketTest.cs

@@ -0,0 +1,416 @@
+//#define GENERATE
+
+using HISP.Tests.Properties;
+using HISP.Game.SwfModules;
+using HISP.Game;
+using HISP.Server;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+
+namespace HISP.Tests.UnitTests
+{
+    public class PacketTest
+    {
+        
+        private static Dictionary<string, string> knownGoodPackets = new Dictionary<string, string>();
+
+        public static bool Test(string name, byte[] packet)
+        {
+            #if GENERATE
+            knownGoodPackets.Add(name, Convert.ToBase64String(packet));
+            return true;
+            #else
+            string goodPacketStr = null;
+            knownGoodPackets.TryGetValue(name, out goodPacketStr);
+            byte[] goodPacket = Convert.FromBase64String(goodPacketStr);
+
+
+            if(!goodPacket.SequenceEqual(packet))
+            {
+                ResultLogger.LogTestResult(false, "PACKET_TEST "+name, BitConverter.ToString(packet).Replace("-", ""), goodPacket.ToString().Replace("-", ""));
+                return false;
+            }
+            else
+            {
+                ResultLogger.LogTestStatus(true, "PACKET_TEST " + name, "Success.");
+                return true;
+            }
+            #endif
+        }
+
+        public static bool RunPacketTest()
+        {
+            #if !GENERATE
+            JObject jobj = JsonConvert.DeserializeObject(Resources.PacketTestDataSet) as JObject;
+            knownGoodPackets = jobj.ToObject<Dictionary<string, string>>();
+            #endif
+
+            List<bool> results = new List<bool>();
+
+            results.Add(Test("2PlayerClose", PacketBuilder.Create2PlayerClose()));
+            
+            // Test Map
+            results.Add(Test("BirdMap_OutsideMapTop", PacketBuilder.CreateBirdMap(-100, -800)));
+            results.Add(Test("BirdMap_OutsideMapBottom", PacketBuilder.CreateBirdMap(Map.Height+100, Map.Width+600)));
+            results.Add(Test("BirdMap_InsideMap", PacketBuilder.CreateBirdMap(100, 200)));
+
+            // Test Brickpoet
+            results.Add(Test("BrickPoetList", PacketBuilder.CreateBrickPoetList(Brickpoet.GetPoetryRoom(1))));
+            results.Add(Test("BrickPoetMove", PacketBuilder.CreateBrickPoetMove(Brickpoet.GetPoetryPeice(Brickpoet.GetPoetryRoom(1), 30))));
+
+            // Test Chat
+            results.Add(Test("ChatBottomLeft", PacketBuilder.CreateChat("Trans Rights", PacketBuilder.CHAT_BOTTOM_LEFT)));
+            results.Add(Test("ChatBottomRight", PacketBuilder.CreateChat("Are Human", PacketBuilder.CHAT_BOTTOM_RIGHT)));
+            results.Add(Test("ChatDmRight", PacketBuilder.CreateChat("Rights", PacketBuilder.CHAT_DM_RIGHT)));
+            results.Add(Test("ChatMotd", PacketBuilder.CreateMotd("Enbies are valid!")));
+
+            // Test Drawing Room 
+            results.Add(Test("DrawingRoomUpdate", PacketBuilder.CreateDrawingUpdate("C959|64^67|66^73|68^79|69^87")));
+
+            // Test Dressup Room
+            results.Add(Test("DressupRoomPeiceLoad", PacketBuilder.CreateDressupRoomPeiceLoad(Dressup.GetDressupRoom(2).DressupPeices)));
+            results.Add(Test("DressupRoomPeiceMove", PacketBuilder.CreateDressupRoomPeiceMove(11, 14.4, 2.4, true)));
+
+            // Test SwfModule Forwarding
+            results.Add(Test("ForwardedSwfModule_516152", PacketBuilder.CreateForwardedSwfModule(new byte[] { 0x51, 0x61, 0x52 })));
+            results.Add(Test("ForwardedSwfModule_AF8D91C8", PacketBuilder.CreateForwardedSwfModule(new byte[] { 0xAF, 0x8D, 0x91, 0xC8 })));
+
+            // Test KeepAlive
+            results.Add(Test("KeepAlive", PacketBuilder.CreateKeepAlive()));
+
+            // Test KickMessage
+            results.Add(Test("KickMessage", PacketBuilder.CreateKickMessage("Transphobia")));
+
+            // Test Login
+            results.Add(Test("LoginSuccess", PacketBuilder.CreateLogin(true)));
+            results.Add(Test("LoginFail", PacketBuilder.CreateLogin(false)));
+            results.Add(Test("LoginFail_ReasonBanned", PacketBuilder.CreateLogin(false, "You are banned.")));
+            
+            // Test Meta
+            results.Add(Test("CreateMeta", PacketBuilder.CreateMeta("^R1Trans Rights^X^Z")));
+
+            // Test Money, PlayerCount, Mail 
+            results.Add(Test("MoneyPlayerCountAndMail", PacketBuilder.CreateMoneyPlayerCountAndMail(100, 1, 40)));
+
+            // Test Movement
+            results.Add(Test("Movement_DirectionUpMoveUpInsideMapWalk", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionUpMoveDownInsideMapWalk", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionUpMoveLeftInsideMapWalk", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionUpMoveRightInsideMapWalk", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionUpMoveUpdateInsideMapWalk", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionUpMoveEscapeInsideMapWalk", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionDownMoveUpInsideMapWalk", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionDownMoveDownInsideMapWalk", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionDownMoveLeftInsideMapWalk", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionDownMoveRightInsideMapWalk", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionDownMoveUpdateInsideMapWalk", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionDownMoveEscapeInsideMapWalk", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionLeftMoveUpInsideMapWalk", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionLeftMoveDownInsideMapWalk", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionLeftMoveLeftInsideMapWalk", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionLeftMoveRightInsideMapWalk", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionLeftMoveUpdateInsideMapWalk", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionLeftMoveEscapeInsideMapWalk", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionRightMoveUpInsideMapWalk", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionRightMoveDownInsideMapWalk", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionRightMoveLeftInsideMapWalk", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionRightMoveRightInsideMapWalk", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionRightMoveUpdateInsideMapWalk", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionRightMoveEscapeInsideMapWalk", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionTeleportMoveUpInsideMapWalk", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveDownInsideMapWalk", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveLeftInsideMapWalk", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveRightInsideMapWalk", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveUpdateInsideMapWalk", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveEscapeInsideMapWalk", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionNoneMoveUpInsideMapWalk", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionNoneMoveDownInsideMapWalk", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionNoneMoveLeftInsideMapWalk", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionNoneMoveRightInsideMapWalk", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionNoneMoveUpdateInsideMapWalk", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionNoneMoveEscapeInsideMapWalk", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_ESCAPE, true)));
+
+            // walk = false
+
+            results.Add(Test("Movement_DirectionUpMoveUpInsideMap", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionUpMoveDownInsideMap", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionUpMoveLeftInsideMap", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionUpMoveRightInsideMap", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionUpMoveUpdateInsideMap", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionUpMoveEscapeInsideMap", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionDownMoveUpInsideMap", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionDownMoveDownInsideMap", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionDownMoveLeftInsideMap", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionDownMoveRightInsideMap", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionDownMoveUpdateInsideMap", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionDownMoveEscapeInsideMap", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionLeftMoveUpInsideMap", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionLeftMoveDownInsideMap", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionLeftMoveLeftInsideMap", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionLeftMoveRightInsideMap", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionLeftMoveUpdateInsideMap", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionLeftMoveEscapeInsideMap", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionRightMoveUpInsideMap", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionRightMoveDownInsideMap", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionRightMoveLeftInsideMap", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionRightMoveRightInsideMap", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionRightMoveUpdateInsideMap", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionRightMoveEscapeInsideMap", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionTeleportMoveUpInsideMap", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveDownInsideMap", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveLeftInsideMap", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveRightInsideMap", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveUpdateInsideMap", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveEscapeInsideMap", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionNoneMoveUpInsideMap", PacketBuilder.CreateMovement(100, 131, 10, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionNoneMoveDownInsideMap", PacketBuilder.CreateMovement(123, 170, 12, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionNoneMoveLeftInsideMap", PacketBuilder.CreateMovement(210, 156, 14, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionNoneMoveRightInsideMap", PacketBuilder.CreateMovement(51, 53, 16, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionNoneMoveUpdateInsideMap", PacketBuilder.CreateMovement(90, 150, 1, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionNoneMoveEscapeInsideMap", PacketBuilder.CreateMovement(87, 43, 7, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_ESCAPE, false)));
+
+            /*
+             *  Test Outside Map (From Top)
+             */
+
+            results.Add(Test("Movement_DirectionUpMoveUpOutsideMapTopWalk", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionUpMoveDownOutsideMapTopWalk", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionUpMoveLeftOutsideMapTopWalk", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionUpMoveRightOutsideMapTopWalk", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionUpMoveUpdateOutsideMapTopWalk", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionUpMoveEscapeOutsideMapTopWalk", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionDownMoveUpOutsideMapTopWalk", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionDownMoveDownOutsideMapTopWalk", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionDownMoveLeftOutsideMapTopWalk", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionDownMoveRightOutsideMapTopWalk", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionDownMoveUpdateOutsideMapTopWalk", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionDownMoveEscapeOutsideMapTopWalk", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionLeftMoveUpOutsideMapTopWalk", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionLeftMoveDownOutsideMapTopWalk", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionLeftMoveLeftOutsideMapTopWalk", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionLeftMoveRightOutsideMapTopWalk", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionLeftMoveUpdateOutsideMapTopWalk", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionLeftMoveEscapeOutsideMapTopWalk", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionRightMoveUpOutsideMapTopWalk", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionRightMoveDownOutsideMapTopWalk", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionRightMoveLeftOutsideMapTopWalk", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionRightMoveRightOutsideMapTopWalk", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionRightMoveUpdateOutsideMapTopWalk", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionRightMoveEscapeOutsideMapTopWalk", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionTeleportMoveUpOutsideMapTopWalk", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveDownOutsideMapTopWalk", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveLeftOutsideMapTopWalk", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveRightOutsideMapTopWalk", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveUpdateOutsideMapTopWalk", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveEscapeOutsideMapTopWalk", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionNoneMoveUpOutsideMapTopWalk", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionNoneMoveDownOutsideMapTopWalk", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionNoneMoveLeftOutsideMapTopWalk", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionNoneMoveRightOutsideMapTopWalk", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionNoneMoveUpdateOutsideMapTopWalk", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionNoneMoveEscapeOutsideMapTopWalk", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_ESCAPE, true)));
+
+            // walk = false
+
+            results.Add(Test("Movement_DirectionUpMoveUpOutsideMapTop", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionUpMoveDownOutsideMapTop", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionUpMoveLeftOutsideMapTop", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionUpMoveRightOutsideMapTop", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionUpMoveUpdateOutsideMapTop", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionUpMoveEscapeOutsideMapTop", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionDownMoveUpOutsideMapTop", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionDownMoveDownOutsideMapTop", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionDownMoveLeftOutsideMapTop", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionDownMoveRightOutsideMapTop", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionDownMoveUpdateOutsideMapTop", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionDownMoveEscapeOutsideMapTop", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionLeftMoveUpOutsideMapTop", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionLeftMoveDownOutsideMapTop", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionLeftMoveLeftOutsideMapTop", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionLeftMoveRightOutsideMapTop", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionLeftMoveUpdateOutsideMapTop", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionLeftMoveEscapeOutsideMapTop", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionRightMoveUpOutsideMapTop", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionRightMoveDownOutsideMapTop", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionRightMoveLeftOutsideMapTop", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionRightMoveRightOutsideMapTop", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionRightMoveUpdateOutsideMapTop", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionRightMoveEscapeOutsideMapTop", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionTeleportMoveUpOutsideMapTop", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveDownOutsideMapTop", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveLeftOutsideMapTop", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveRightOutsideMapTop", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveUpdateOutsideMapTop", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveEscapeOutsideMapTop", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionNoneMoveUpOutsideMapTop", PacketBuilder.CreateMovement(-100, -131, 10, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionNoneMoveDownOutsideMapTop", PacketBuilder.CreateMovement(-123, -170, 12, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionNoneMoveLeftOutsideMapTop", PacketBuilder.CreateMovement(-210, -156, 14, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionNoneMoveRightOutsideMapTop", PacketBuilder.CreateMovement(-51, -53, 16, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionNoneMoveUpdateOutsideMapTop", PacketBuilder.CreateMovement(-90, -150, 1, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionNoneMoveEscapeOutsideMapTop", PacketBuilder.CreateMovement(-87, -43, 7, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_ESCAPE, false)));
+
+            /*
+             *  Test Outside Map (From Bottom)
+             */
+
+            results.Add(Test("Movement_DirectionUpMoveUpOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionUpMoveDownOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionUpMoveLeftOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionUpMoveRightOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionUpMoveUpdateOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionUpMoveEscapeOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionDownMoveUpOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionDownMoveDownOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionDownMoveLeftOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionDownMoveRightOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionDownMoveUpdateOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionDownMoveEscapeOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionLeftMoveUpOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionLeftMoveDownOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionLeftMoveLeftOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionLeftMoveRightOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionLeftMoveUpdateOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionLeftMoveEscapeOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionRightMoveUpOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionRightMoveDownOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionRightMoveLeftOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionRightMoveRightOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionRightMoveUpdateOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionRightMoveEscapeOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionTeleportMoveUpOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveDownOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveLeftOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveRightOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveUpdateOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionTeleportMoveEscapeOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_ESCAPE, true)));
+
+            results.Add(Test("Movement_DirectionNoneMoveUpOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UP, true)));
+            results.Add(Test("Movement_DirectionNoneMoveDownOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_DOWN, true)));
+            results.Add(Test("Movement_DirectionNoneMoveLeftOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_LEFT, true)));
+            results.Add(Test("Movement_DirectionNoneMoveRightOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_RIGHT, true)));
+            results.Add(Test("Movement_DirectionNoneMoveUpdateOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UPDATE, true)));
+            results.Add(Test("Movement_DirectionNoneMoveEscapeOutsideMapBottomWalk", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_ESCAPE, true)));
+
+            // walk = false
+
+            results.Add(Test("Movement_DirectionUpMoveUpOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionUpMoveDownOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionUpMoveLeftOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionUpMoveRightOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionUpMoveUpdateOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionUpMoveEscapeOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_UP, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionDownMoveUpOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionDownMoveDownOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionDownMoveLeftOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionDownMoveRightOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionDownMoveUpdateOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionDownMoveEscapeOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_DOWN, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionLeftMoveUpOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionLeftMoveDownOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionLeftMoveLeftOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionLeftMoveRightOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionLeftMoveUpdateOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionLeftMoveEscapeOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_LEFT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionRightMoveUpOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionRightMoveDownOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionRightMoveLeftOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionRightMoveRightOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionRightMoveUpdateOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionRightMoveEscapeOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_RIGHT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionTeleportMoveUpOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveDownOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveLeftOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveRightOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveUpdateOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionTeleportMoveEscapeOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_TELEPORT, PacketBuilder.MOVE_ESCAPE, false)));
+
+            results.Add(Test("Movement_DirectionNoneMoveUpOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+100, Map.Height+131, 10, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UP, false)));
+            results.Add(Test("Movement_DirectionNoneMoveDownOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+123, Map.Height+170, 12, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_DOWN, false)));
+            results.Add(Test("Movement_DirectionNoneMoveLeftOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+210, Map.Height+156, 14, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_LEFT, false)));
+            results.Add(Test("Movement_DirectionNoneMoveRightOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+51, Map.Height+53, 16, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_RIGHT, false)));
+            results.Add(Test("Movement_DirectionNoneMoveUpdateOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+90, Map.Height+150, 1, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_UPDATE, false)));
+            results.Add(Test("Movement_DirectionNoneMoveEscapeOutsideMapBottom", PacketBuilder.CreateMovement(Map.Width+87, Map.Height+43, 7, PacketBuilder.DIRECTION_NONE, PacketBuilder.MOVE_ESCAPE, false)));
+
+            // Test Place Data Packet
+            results.Add(Test("PlaceData", PacketBuilder.CreatePlaceData(World.Isles.ToArray(), World.Towns.ToArray(), World.Areas.ToArray())));
+            
+            // Test Player Update
+            results.Add(Test("PlayerInfoUpdateOrCreate", PacketBuilder.CreatePlayerInfoUpdateOrCreate(100, 200, PacketBuilder.DIRECTION_UP, 10, "Li")));
+            results.Add(Test("PlayerLeave", PacketBuilder.CreatePlayerLeave("Li")));
+
+            // Test PlaySound Packet
+            results.Add(Test("PlaySound", PacketBuilder.CreatePlaySound("PM")));
+            
+            // Test Profile Page
+            results.Add(Test("ProfilePage", PacketBuilder.CreateProfilePage("TRANS RIGHTS ARE HUMAN RIGHTS")));
+
+            // Test SecCode
+            results.Add(Test("SecCode_AdminMod", PacketBuilder.CreateSecCode(new byte[] { 0x31, 0x52, 0x22 }, 0x34, true, true)));
+            results.Add(Test("SecCode_Admin", PacketBuilder.CreateSecCode(new byte[] { 0x54, 0x32, 0x24 }, 0x34, true, false)));
+            results.Add(Test("SecCode_Mod", PacketBuilder.CreateSecCode(new byte[] { 0x22, 0x12, 0x12 }, 0x34, false, true)));
+            results.Add(Test("SecCode_User", PacketBuilder.CreateSecCode(new byte[] { 0x12, 0x32, 0x14 }, 0x34, false, false)));
+
+            // Test SwfModule
+            results.Add(Test("SwfModule_Force", PacketBuilder.CreateSwfModule("test.swf", PacketBuilder.PACKET_SWF_MODULE_FORCE)));
+            results.Add(Test("SwfModule_Gentle", PacketBuilder.CreateSwfModule("test.swf", PacketBuilder.PACKET_SWF_MODULE_GENTLE)));
+            results.Add(Test("SwfModule_Cutscene", PacketBuilder.CreateSwfModule("test.swf", PacketBuilder.PACKET_SWF_MODULE_CUTSCENE)));
+
+            // Test TileClickInfo
+            results.Add(Test("TileClickInfo", PacketBuilder.CreateTileClickInfo("Trans Rights Are Human Rights")));
+
+            // Test TileOverlayFlags
+            //results.Add(Test("TileOverlayFlags", PacketBuilder.CreateTileOverlayFlags(new int[] { 1, 2, 3, 1, 2, 3, 1, 2, 3 })));
+
+            // Test TimeAndWeatherUpdate
+            results.Add(Test("TimeAndWeatherUpdate", PacketBuilder.CreateTimeAndWeatherUpdate(10, 4, 541, "SUNNY")));
+            results.Add(Test("WeatherUpdate", PacketBuilder.CreateWeatherUpdate("CLOUD")));
+
+            #if GENERATE
+            string resultsStr = JsonConvert.SerializeObject(knownGoodPackets, Formatting.Indented);
+            File.WriteAllText("test.json", resultsStr);
+            #endif
+
+            foreach(bool result in results)
+            {
+                if (result == false)
+                    return false;
+            }
+            return true;
+        }
+    }
+}

HorseIsleServer/HISPtests/UnitTests/ServerStartTest.cs

@@ -0,0 +1,40 @@
+using HISP.Server;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HISP.Tests.UnitTests
+{
+    public class ServerStartTest
+    {
+
+        public static void OnShutdown()
+        {
+            ResultLogger.LogTestStatus(false, "START_SERVER", "OnShutdown called");
+        }
+        public static void LogStdout(bool error, string type, string text)
+        {
+            if (type == "CRASH")
+                ResultLogger.LogTestStatus(false, "START_SERVER", text);
+        }
+
+        public static bool RunServerStartTest()
+        {
+            try
+            {
+                Logger.SetCallback(LogStdout);
+                Entry.SetShutdownCallback(OnShutdown);
+                Entry.Start();
+                ResultLogger.LogTestStatus(true, "START_SERVER_TEST", "Success.");
+                return true;
+            }
+            catch (Exception e)
+            {
+                ResultLogger.LogTestStatus(false, "START_SERVER_TEST", e.Message);
+                return false;
+            }
+        }
+    }
+}

HorseIsleServer/HISPtests/UnitTests/UserTest.cs

@@ -0,0 +1,248 @@
+using HISP.Game;
+using HISP.Game.Horse;
+using HISP.Game.Items;
+using HISP.Player;
+using HISP.Security;
+using HISP.Server;
+using HISP.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HISP.Tests.UnitTests
+{
+    public class UserTest
+    {
+        private const string ALLOWED_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890";
+
+        private static byte[] createLoginPacket(string username, string password)
+        {
+            byte[] loginInformation = Encoding.UTF8.GetBytes("91|" + Authentication.EncryptLogin(username) + "|" + Authentication.EncryptLogin(password) + "|");
+            byte[] loginPacket = new byte[1 * 3 + loginInformation.Length];
+            loginPacket[0] = PacketBuilder.PACKET_LOGIN;
+            loginPacket[loginPacket.Length - 2] = PacketBuilder.PACKET_CLIENT_TERMINATOR;
+            loginPacket[loginPacket.Length - 1] = 0;
+
+            Array.ConstrainedCopy(loginInformation, 0, loginPacket, 1, loginInformation.Length);
+
+            return loginPacket;
+        }
+
+        private static byte[] createUserInfoPacket()
+        {
+            byte[] packet = new byte[] { PacketBuilder.PACKET_LOGIN, PacketBuilder.PACKET_CLIENT_TERMINATOR, 0};
+            return packet;
+        }
+
+        public static bool Test(string testName, object value, object valueComp)
+        {
+            bool result = value.Equals(valueComp);
+            if (result)
+                ResultLogger.LogTestStatus(true, "USER_TEST "+testName, "Success.");
+            else
+                ResultLogger.LogTestResult(false, "USER_TEST " + testName, value.ToString(), valueComp.ToString());
+
+            return result;
+        }
+
+        private static async Task<byte[]> receiveAsync(Socket s)
+        {
+            byte[] buffer = new byte[s.Available];
+            await s.ReceiveAsync(buffer);
+            return buffer;
+        }
+
+        public static async Task<bool> RunUserTest()
+        {
+            List<bool> results = new List<bool>();
+
+            string username = Helper.RandomString(ALLOWED_CHARS);
+            string password = Helper.RandomString(ALLOWED_CHARS);
+
+            int userId = Authentication.CreateAccount(username, password, "GENDERFLUID", true, true);
+
+            // Connect to running server via TCP;
+            using (Socket hispServer = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                // This is already a pretty good unit test; confirming we can actually login to the game,
+
+                try
+                {
+                    await hispServer.ConnectAsync("127.0.0.1", ConfigReader.Port);
+
+                    // Login to the game;
+                    await hispServer.SendAsync(createLoginPacket(username, password));
+                    await receiveAsync(hispServer);
+
+                    await hispServer.SendAsync(createUserInfoPacket());
+                    await receiveAsync(hispServer);
+
+
+                    ResultLogger.LogTestStatus(true, "GAME_LOGIN_TEST", "Success.");
+                }
+                catch (Exception e)
+                {
+                    ResultLogger.LogTestStatus(false, "GAME_LOGIN_TEST", e.Message);
+                    return false;
+                }
+
+
+
+                // While were here; lets do a bunch of tests on HISPs "User" object.
+                User user = GameServer.GetUserById(userId);
+
+
+                // Test Maximums
+
+                user.SetMoney(Int32.MaxValue);
+                user.AddMoney(1000);
+                results.Add(Test("MoneyOverflow", user.Money, Int32.MaxValue));
+
+                user.Hunger = 8000;
+                results.Add(Test("HungerMaximumEnforcement", user.Hunger, 1000));
+                user.Hunger = -8000;
+                results.Add(Test("HungerMinimumEnforcement", user.Hunger, 0));
+
+                user.Thirst = 8000;
+                results.Add(Test("ThirstMaximumEnforcement", user.Thirst, 1000));
+                user.Thirst = -8000;
+                results.Add(Test("ThirstMinimumEnforcement", user.Thirst, 0));
+
+                user.Tiredness = 8000;
+                results.Add(Test("TirednessMaximumEnforcement", user.Tiredness, 1000));
+                user.Tiredness = -8000;
+                results.Add(Test("TirednessMinimumEnforcement", user.Tiredness, 0));
+
+
+                user.BankMoney = 9999999999.9999;
+                user.BankMoney += 1000.0;
+                results.Add(Test("BankMoneyMaximumEnforcement", user.BankMoney, 9999999999.9999));
+
+                user.BankInterest = 9999999999.9999;
+                user.BankInterest += 1000.0;
+                results.Add(Test("BankInterestMaximumEnforcement", user.BankInterest, 9999999999.9999));
+
+                // Test Gender Setting
+                user.Gender = "GENDERFLUID";
+                results.Add(Test("GenderedPronounsTestTheir", user.GetPronouns(true), Messages.PronounNeutralTheir));
+                results.Add(Test("GenderedPronounsTestThey", user.GetPronouns(false), Messages.PronounNeutralThey));
+
+                user.Gender = "MALE";
+                results.Add(Test("GenderedPronounsTestHis", user.GetPronouns(true), Messages.PronounMaleHis));
+                results.Add(Test("GenderedPronounsTestHe", user.GetPronouns(false), Messages.PronounMaleHe));
+
+                user.Gender = "FEMALE";
+                results.Add(Test("GenderedPronounsTestHer", user.GetPronouns(true), Messages.PronounFemaleHer));
+                results.Add(Test("GenderedPronounsTestShe", user.GetPronouns(false), Messages.PronounFemaleShe));
+
+                // Test icon
+
+                results.Add(Test("IconTestAdmin", user.GetPlayerListIcon(), Messages.AdminIcon));
+                user.Administrator = false;
+                results.Add(Test("IconTestModerator", user.GetPlayerListIcon(), Messages.ModeratorIcon));
+                user.Moderator = false;
+                results.Add(Test("IconTestNew", user.GetPlayerListIcon(), Messages.NewUserIcon));
+                user.NewPlayer = false;
+                results.Add(Test("IconTestNone", user.GetPlayerListIcon(), -1));
+
+                user.SubscribedUntil = DateTime.UtcNow.AddMonths(1);
+                user.Subscribed = true;
+                results.Add(Test("IconTest1Month", user.GetPlayerListIcon(), Messages.MonthSubscriptionIcon));
+                user.SubscribedUntil = DateTime.UtcNow.AddMonths(3);
+                results.Add(Test("IconTest3Month", user.GetPlayerListIcon(), Messages.ThreeMonthSubscripitionIcon));
+                user.SubscribedUntil = DateTime.UtcNow.AddYears(1).AddMonths(3);
+                results.Add(Test("IconTest1Year", user.GetPlayerListIcon(), Messages.YearSubscriptionIcon));
+
+                // SecCode
+                user.SecCodeSeeds[0] = 0x34;
+                user.SecCodeSeeds[1] = 0x39;
+                user.SecCodeSeeds[2] = 0x2a;
+                user.SecCodeInc = 0x3e;
+
+                byte[] expectedSecCodeResult = { 0x55, 0x3C, 0x4B, 0x58 };
+                byte[] gotSecCode = user.GenerateSecCode();
+
+                results.Add(Test("GenerateSecCode", gotSecCode.SequenceEqual(expectedSecCodeResult), true));
+
+                // Check max horses count
+                user.Subscribed = false;
+                results.Add(Test("UnsubbedMaxHorses", user.MaxHorses, 7));
+
+                user.Subscribed = true;
+                results.Add(Test("SubbedMaxHorses", user.MaxHorses, 11));
+
+
+                HorseInstance horse = new HorseInstance(HorseInfo.GetBreedById(170));
+                horse.BasicStats.Thirst = 0;
+                horse.BasicStats.Hunger = 0;
+                int horseId = horse.RandomId;
+
+                user.HorseInventory.AddHorse(horse);
+
+                /*
+                 * Test Ranches
+                 */
+
+                // Give player ranch id 10
+                Ranch.GetRanchById(37).OwnerId = user.Id;
+
+                // Check ranch is now owned by that player, and propagates to user object.
+                results.Add(Test("GiveRanchTest", user.OwnedRanch.Id, 37));
+                results.Add(Test("HaveDorothyShoes", user.Inventory.HasItemId(Item.DorothyShoes), true));
+
+                // Ranch upgrade test
+                foreach(Ranch.RanchUpgrade upgrade in Ranch.RanchUpgrade.RanchUpgrades)
+                {
+                    int id = upgrade.Id;
+                    user.OwnedRanch.UpgradedLevel = id;
+                }
+
+                // Test swf
+                results.Add(Test("RanchSwfMine", user.OwnedRanch.GetSwf(true), "ranchviewer.swf?H=10&B1=11&B2=&B3=&B4=&B5=&B6=&B7=&B8=&B9=&B10=&B11=&B12=&B13=&B14=&B15=&B16=&MINE=1"));
+                results.Add(Test("RanchSwf", user.OwnedRanch.GetSwf(false), "ranchviewer.swf?H=10&B1=11&B2=&B3=&B4=&B5=&B6=&B7=&B8=&B9=&B10=&B11=&B12=&B13=&B14=&B15=&B16="));
+
+                // Test Ranch Building Functionality
+
+                // Test Barn
+                user.OwnedRanch.SetBuilding(0, Ranch.RanchBuilding.GetRanchBuildingById(1)); // Barn
+                results.Add(Test("RanchBarnMaxHorses", user.MaxHorses, 11 + 4));
+
+                // Test Water Well
+                user.OwnedRanch.SetBuilding(0, Ranch.RanchBuilding.GetRanchBuildingById(2)); // Water Well
+                user.Teleport(user.OwnedRanch.X, user.OwnedRanch.Y);
+                results.Add(Test("RanchWaterWellWatering", user.HorseInventory.GetHorseById(horseId).BasicStats.Thirst, 1000));
+                
+                // Test Grain Silo
+                user.OwnedRanch.SetBuilding(0, Ranch.RanchBuilding.GetRanchBuildingById(3)); // Grain Silo
+                user.Teleport(user.OwnedRanch.X, user.OwnedRanch.Y);
+                results.Add(Test("RanchGrainSiloFeeding", user.HorseInventory.GetHorseById(horseId).BasicStats.Hunger, 1000));
+
+
+                // Set building id 0 to a big barn
+                user.OwnedRanch.SetBuilding(0, Ranch.RanchBuilding.GetRanchBuildingById(10)); // Big Barn
+                results.Add(Test("RanchBigBarnMaxHorses", user.MaxHorses, 11 + 8));
+
+                // Set building id 0 to a gold barn
+                user.OwnedRanch.SetBuilding(0, Ranch.RanchBuilding.GetRanchBuildingById(11)); // Gold Barn
+                results.Add(Test("RanchGoldBarnMaxHorses", user.MaxHorses, 11 + 12));
+
+
+
+
+                foreach (bool result in results)
+                    if (!result)
+                        return false;
+                
+                return true;
+
+            }
+
+
+        }
+
+    }
+}
+

HorseIsleServer/LibHISP/Game/Arena.cs

@@ -201,10 +201,10 @@ namespace HISP.Game
                         break;
                 }
                 byte[] startingUpEventPacket = PacketBuilder.CreateChat(message, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                byte[] swfModulePacket = PacketBuilder.CreateSwfModule(swf, PacketBuilder.PACKET_SWF_CUTSCENE);
+                byte[] swfModulePacket = PacketBuilder.CreateSwfModule(swf, PacketBuilder.PACKET_SWF_MODULE_CUTSCENE);
                 Logger.DebugPrint(entry.EnteredUser.Username + " Loading swf: " + swf);
-                entry.EnteredUser.LoggedinClient.SendPacket(swfModulePacket);
-                entry.EnteredUser.LoggedinClient.SendPacket(startingUpEventPacket);
+                entry.EnteredUser.Client.SendPacket(swfModulePacket);
+                entry.EnteredUser.Client.SendPacket(startingUpEventPacket);
             }
 
             arenaTimeout = new Timer(new TimerCallback(arenaTimedOut), null, Timeout * 60 * 1000, Timeout * 60 * 1000);
@@ -275,7 +275,7 @@ namespace HISP.Game
                     try
                     {
                         byte[] arenaResults = PacketBuilder.CreateChat(chatMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                        entry.EnteredUser.LoggedinClient.SendPacket(arenaResults);
+                        entry.EnteredUser.Client.SendPacket(arenaResults);
 
                         int expReward = expRewards[place];
 
@@ -289,7 +289,7 @@ namespace HISP.Game
 
 
                             byte[] youWinMessage = PacketBuilder.CreateChat(Messages.FormatArenaYouWinMessage(prize, expReward), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            entry.EnteredUser.LoggedinClient.SendPacket(youWinMessage);
+                            entry.EnteredUser.Client.SendPacket(youWinMessage);
 
                             // Awards:
 
@@ -327,7 +327,7 @@ namespace HISP.Game
                                 entry.EnteredUser.Awards.AddAward(Award.GetAwardById(32)); // Perseverance
 
                             byte[] youDONTWinMessage = PacketBuilder.CreateChat(Messages.FormatArenaOnlyWinnerWinsMessage(expReward), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            entry.EnteredUser.LoggedinClient.SendPacket(youDONTWinMessage);
+                            entry.EnteredUser.Client.SendPacket(youDONTWinMessage);
                         }
                         place++;
                     }
@@ -361,8 +361,8 @@ namespace HISP.Game
                 if (Entries.Length + 1 > Slots)
                 {
                     byte[] enterFailed = PacketBuilder.CreateChat(Messages.ArenaFullErrorMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    user.LoggedinClient.SendPacket(enterFailed);
-                    GameServer.UpdateArea(user.LoggedinClient);
+                    user.Client.SendPacket(enterFailed);
+                    GameServer.UpdateArea(user.Client);
                     return;
                 }
             }
@@ -378,7 +378,7 @@ namespace HISP.Game
             user.TakeMoney(EntryCost);
 
             byte[] enteredIntoCompetition = PacketBuilder.CreateChat(Messages.ArenaEnteredInto, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            user.LoggedinClient.SendPacket(enteredIntoCompetition);
+            user.Client.SendPacket(enteredIntoCompetition);
             GameServer.UpdateAreaForAll(user.X, user.Y, true);
 
             return;

HorseIsleServer/LibHISP/Game/Chat/ChatMsg.cs

@@ -8,7 +8,7 @@ using HISP.Server;
 
 namespace HISP.Game.Chat
 {
-    public class Chat
+    public class ChatMsg
     {
         public struct Correction
         {
@@ -102,7 +102,7 @@ namespace HISP.Game.Chat
                     if (parsedMessage.ToUpper(CultureInfo.InvariantCulture).StartsWith(cmd.CmdName))
                     {
                         string[] args = parsedMessage.Substring(cmd.CmdName.Length).Trim().Split(' ');
-                        return cmd.CmdCallback(messageToGive, args, user);
+                        return cmd.Execute(messageToGive, args, user);
                     }
                 }
             }
@@ -197,9 +197,9 @@ namespace HISP.Game.Chat
                 foreach (GameClient client in GameClient.ConnectedClients)
                 {
                     if (client.LoggedIn)
-                        if (!client.LoggedinUser.MuteGlobal && !client.LoggedinUser.MuteAll)
-                            if (client.LoggedinUser.Id != user.Id)
-                                if(!client.LoggedinUser.MutePlayer.IsUserMuted(user))
+                        if (!client.User.MuteGlobal && !client.User.MuteAll)
+                            if (client.User.Id != user.Id)
+                                if(!client.User.MutePlayer.IsUserMuted(user))
                                     recipiants.Add(client);
                 }
                 return recipiants.ToArray();
@@ -211,9 +211,9 @@ namespace HISP.Game.Chat
                 foreach (GameClient client in GameClient.ConnectedClients)
                 {
                     if (client.LoggedIn)
-                        if (!client.LoggedinUser.MuteAds && !client.LoggedinUser.MuteAll)
-                            if (client.LoggedinUser.Id != user.Id)
-                                if (!client.LoggedinUser.MutePlayer.IsUserMuted(user))
+                        if (!client.User.MuteAds && !client.User.MuteAll)
+                            if (client.User.Id != user.Id)
+                                if (!client.User.MutePlayer.IsUserMuted(user))
                                     recipiants.Add(client);
                 }
                 return recipiants.ToArray();
@@ -225,10 +225,10 @@ namespace HISP.Game.Chat
                 foreach (GameClient client in GameClient.ConnectedClients)
                 {
                     if (client.LoggedIn)
-                        if (!client.LoggedinUser.MuteBuddy && !client.LoggedinUser.MuteAll)
-                            if (client.LoggedinUser.Id != user.Id)
-                                if (client.LoggedinUser.Friends.List.Contains(user.Id))
-                                    if (!client.LoggedinUser.MutePlayer.IsUserMuted(user))
+                        if (!client.User.MuteBuddy && !client.User.MuteAll)
+                            if (client.User.Id != user.Id)
+                                if (client.User.Friends.List.Contains(user.Id))
+                                    if (!client.User.MutePlayer.IsUserMuted(user))
                                         recipiants.Add(client);
                 }
                 return recipiants.ToArray();
@@ -245,7 +245,7 @@ namespace HISP.Game.Chat
                         if (user.Id != userInIsle.Id)
                             if(!userInIsle.MuteAll && !userInIsle.MuteIsland)
                                 if(!userInIsle.MutePlayer.IsUserMuted(user))
-                                    recipiants.Add(userInIsle.LoggedinClient);
+                                    recipiants.Add(userInIsle.Client);
                     }
                     return recipiants.ToArray();
                 }
@@ -265,7 +265,7 @@ namespace HISP.Game.Chat
                     if (user.Id != userHere.Id)
                         if (!userHere.MuteAll && !userHere.MuteHere)
                             if (!userHere.MutePlayer.IsUserMuted(user))
-                                recipiants.Add(userHere.LoggedinClient);
+                                recipiants.Add(userHere.Client);
                 }
                 return recipiants.ToArray();
             }
@@ -279,7 +279,7 @@ namespace HISP.Game.Chat
                     if (user.Id != nearbyUser.Id)
                         if (!nearbyUser.MuteAll && !nearbyUser.MuteNear)
                             if (!nearbyUser.MutePlayer.IsUserMuted(user))
-                                recipiants.Add(nearbyUser.LoggedinClient);
+                                recipiants.Add(nearbyUser.Client);
                 }
                 return recipiants.ToArray();
             }
@@ -296,8 +296,8 @@ namespace HISP.Game.Chat
                 foreach (GameClient client in GameClient.ConnectedClients)
                 {
                     if (client.LoggedIn)
-                        if (client.LoggedinUser.Moderator)
-                            if (client.LoggedinUser.Id != user.Id)
+                        if (client.User.Moderator)
+                            if (client.User.Id != user.Id)
                                 recipiants.Add(client);
                 }
                 return recipiants.ToArray();
@@ -316,8 +316,8 @@ namespace HISP.Game.Chat
                 foreach (GameClient client in GameClient.ConnectedClients)
                 {
                     if (client.LoggedIn)
-                        if (client.LoggedinUser.Administrator)
-                            if (client.LoggedinUser.Id != user.Id)
+                        if (client.User.Administrator)
+                            if (client.User.Id != user.Id)
                                 recipiants.Add(client);
                 }
                 return recipiants.ToArray();
@@ -332,9 +332,9 @@ namespace HISP.Game.Chat
                     {
                         if (client.LoggedIn)
                         {
-                            if (!client.LoggedinUser.MutePrivateMessage && !client.LoggedinUser.MuteAll)
+                            if (!client.User.MutePrivateMessage && !client.User.MuteAll)
                             {
-                                if (client.LoggedinUser.Username.ToLower().StartsWith(to.ToLower()))
+                                if (client.User.Username.ToLower().StartsWith(to.ToLower()))
                                 {
                                     recipiants.Add(client);
                                     break;

HorseIsleServer/LibHISP/Game/Chat/Command.cs

@@ -8,6 +8,7 @@ using HISP.Game.Inventory;
 using System.Linq;
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
 
 namespace HISP.Game.Chat
 {
@@ -21,9 +22,9 @@ namespace HISP.Game.Chat
                     continue;
                 if (client.LoggedIn)
                 {
-                    if (client.LoggedinUser.Username.ToLower().StartsWith(name.ToLower()))
+                    if (client.User.Username.ToLower().StartsWith(name.ToLower()))
                     {
-                        return client.LoggedinUser;
+                        return client.User;
                     }
                 }
             }
@@ -33,41 +34,124 @@ namespace HISP.Game.Chat
         public static void RegisterCommands()
         {
             // Admin Commands
-            new CommandRegister('%', "GIVE", "OBJECT <itemid / RANDOM> [username / ALL]\nMONEY <amount> [username]\nHORSE <breedid> [username]\nQUEST <questid> [FORCE]\nAWARD <awardid> [username]", Command.Give);
-            new CommandRegister('%', "SWF", "<swf> [username / ALL]", Command.Swf);
-            new CommandRegister('%', "GOTO", "<x>,<y>\nPLAYER <playername>\nAREA <locationname>\nNPC <npcname>", Command.Goto);
-            new CommandRegister('%', "JUMP", "<username> HERE", Command.Jump);
-            new CommandRegister('%', "KICK" , "<username> [reason]", Command.Kick);
-            new CommandRegister('%', "NOCLIP", "", Command.NoClip);
-            new CommandRegister('%', "MODHORSE", "<slot id> <stat> <value>", Command.ModHorse);
-            new CommandRegister('%', "DELITEM", "<item id> [username]", Command.DelItem);
-            new CommandRegister('%', "SHUTDOWN", "", Command.Shutdown);
-            new CommandRegister('%', "CALL", "HORSE", Command.CallHorse);
-            new CommandRegister('%', "MESSAGE", "<message>", Command.Message);
+            new CommandRegister('%', "GIVE", "OBJECT <itemid / RANDOM> [username / ALL]\nMONEY <amount> [username]\nHORSE <breedid> [username]\nQUEST <questid> [FORCE]\nAWARD <awardid> [username]", Command.Give, true, false);
+            new CommandRegister('%', "SWF", "<swf> [username / ALL]", Command.Swf, true, false);
+            new CommandRegister('%', "GOTO", "<x>,<y>\nPLAYER <playername>\nAREA <locationname>\nNPC <npcname>", Command.Goto, true, false);
+            new CommandRegister('%', "JUMP", "<username> HERE", Command.Jump, true, false);
+            new CommandRegister('%', "NOCLIP", "", Command.NoClip, true, false);
+            new CommandRegister('%', "MODHORSE", "<slot id> <stat> <value>", Command.ModHorse, true, false);
+            new CommandRegister('%', "DELITEM", "<item id> [username]", Command.DelItem, true, false);
+            new CommandRegister('%', "SHUTDOWN", "", Command.Shutdown, true, false);
+            new CommandRegister('%', "CALL", "HORSE", Command.CallHorse, true, false);
+            new CommandRegister('%', "MESSAGE", "<message>", Command.Message, true, false);
+            new CommandRegister('%', "PERMISSION", "<username> <admin / moderator / normal>", Command.Permission, true, false);
 
             // Moderator commands
-            new CommandRegister('%', "RULES", "<username>", Command.Rules);
-            new CommandRegister('%', "PRISON", "<username>", Command.Prison);
-            new CommandRegister('%', "STEALTH", "", Command.Stealth);
-            new CommandRegister('%', "BAN", "<username> [reason]", Command.Ban);
-            new CommandRegister('%', "UNBAN", "<username>", Command.UnBan);
-            new CommandRegister('%', "ESCAPE", "", Command.Escape);
+            new CommandRegister('%', "RULES", "<username>", Command.Rules, false, true);
+            new CommandRegister('%', "PRISON", "<username>", Command.Prison, false, true);
+            new CommandRegister('%', "STEALTH", "", Command.Stealth, false, true);
+            new CommandRegister('%', "KICK", "<username> [reason]", Command.Kick, false, true);
+            new CommandRegister('%', "BAN", "<username> [reason]", Command.Ban, false, true);
+            new CommandRegister('%', "UNBAN", "<username>", Command.UnBan, false, true);
+            new CommandRegister('%', "ESCAPE", "", Command.Escape, false, true);
 
             // User commands
-            new CommandRegister('!', "MUTE", "ALL\nGLOBAL\nISLAND\nNEAR\nHERE\nBUDDY\nPM\nBR\nSOCIALS\nLOGINS", Command.Mute);
-            new CommandRegister('!', "UNMUTE", "ALL\nGLOBAL\nISLAND\nNEAR\nHERE\nBUDDY\nPM\nBR\nSOCIALS\nLOGINS", Command.UnMute);
-            new CommandRegister('!', "HEAR", "ALL\nGLOBAL\nISLAND\nNEAR\nHERE\nBUDDY\nPM\nBR\nSOCIALS\nLOGINS", Command.UnMute);
-            new CommandRegister('!', "AUTOREPLY", "[message]", Command.AutoReply);
-            new CommandRegister('!', "QUIZ", "", Command.Quiz);
-            new CommandRegister('!', "WARP", "<username / location>", Command.Warp);
-            new CommandRegister('!', "DANCE", "<udlr>", Command.Dance);
-            new CommandRegister('!', "VERSION", "", Command.Version);
+            new CommandRegister('%', "VERSION", "", Command.Version, false, false);
+            new CommandRegister('%', "HELP", "", Command.Help, false, false);
+
+            new CommandRegister('!', "MUTE", "ALL\nGLOBAL\nISLAND\nNEAR\nHERE\nBUDDY\nPM\nBR\nSOCIALS\nLOGINS", Command.Mute, false, false);
+            new CommandRegister('!', "UNMUTE", "ALL\nGLOBAL\nISLAND\nNEAR\nHERE\nBUDDY\nPM\nBR\nSOCIALS\nLOGINS", Command.UnMute, false, false);
+            new CommandRegister('!', "HEAR", "ALL\nGLOBAL\nISLAND\nNEAR\nHERE\nBUDDY\nPM\nBR\nSOCIALS\nLOGINS", Command.UnMute, false, false);
+            new CommandRegister('!', "AUTOREPLY", "[message]", Command.AutoReply, false, false);
+            new CommandRegister('!', "QUIZ", "", Command.Quiz, false, false);
+            new CommandRegister('!', "WARP", "<username / location>", Command.Warp, false, false);
+            new CommandRegister('!', "DANCE", "<udlr>", Command.Dance, false, false);
+        }
+
+        public static bool Help(string message, string[] args, User user)
+        {
+
+            foreach (CommandRegister cmd in CommandRegister.RegisteredCommands)
+            {
+                if (!cmd.HasPermission(user)) continue;
+                
+                user.Client.SendPacket(PacketBuilder.CreateChat(Messages.FormatHispHelpUsage(cmd.CmdLetter, cmd.CmdName, cmd.CmdUsage).Replace("\n", "<BR>\t"), PacketBuilder.CHAT_BOTTOM_LEFT));
+            }
+
+            user.Client.SendPacket(PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT));
+
+            return true;
+        }
+
+        public static bool Permission(string message, string[] args, User user)
+        {
+            if (args.Length < 2)
+                return false;
+            string username = args[0].Trim();
+            string privledgeLevel = args[1].ToUpper().Trim();
+
+            try
+            {
+                User modifyUser = findNamePartial(username);
+
+                if (privledgeLevel == "NORMAL")
+                {
+                    modifyUser.Administrator = false;
+                    modifyUser.Moderator = false;
+                }
+                else if (privledgeLevel == "ADMIN")
+                {
+                    modifyUser.Administrator = true;
+                    modifyUser.Moderator = true;
+                }
+                else if (privledgeLevel == "MOD" || privledgeLevel == "MODERATOR")
+                {
+                    modifyUser.Administrator = false;
+                    modifyUser.Moderator = true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (KeyNotFoundException) 
+            {
+                try
+                {
+                    int playerId = Database.GetUserid(username);
+
+                    if (privledgeLevel == "NORMAL")
+                    {
+                        Database.SetUserAdmin(playerId, false);
+                        Database.SetUserMod(playerId, false);
+                    }
+                    else if (privledgeLevel == "ADMIN")
+                    {
+                        Database.SetUserAdmin(playerId, true);
+                        Database.SetUserMod(playerId, true);
+                    }
+                    else if (privledgeLevel == "MOD" || privledgeLevel == "MODERATOR")
+                    {
+                        Database.SetUserAdmin(playerId, false);
+                        Database.SetUserMod(playerId, true);
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                catch (KeyNotFoundException) { return false; };
+            };
+
+            byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
+            user.Client.SendPacket(chatPacket);
+            
+
+            return true;
         }
 
         public static bool Message(string message, string[] args, User user)
         {
-            if (!user.Administrator)
-                return false;
 
             string serverAnnoucement = String.Join(" ", args);
 
@@ -86,13 +170,12 @@ namespace HISP.Game.Chat
             return true;
         }
         public static bool Shutdown(string message, string[] args, User user)
-        {
-            if (!user.Administrator)
-                return false;         
+        {  
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
-            GameServer.ShutdownServer();
+            user.Client.SendPacket(chatPacket);
+
+            GameServer.ShutdownServer("Administrator initiated");
 
             return true;
         }
@@ -100,8 +183,6 @@ namespace HISP.Game.Chat
         {
             if (args.Length <= 0)
                 return false;
-            if (!user.Administrator)
-                return false;
             if(args[0].ToUpper() == "OBJECT")
             {
                 int itemId = 0;
@@ -136,7 +217,7 @@ namespace HISP.Game.Chat
                                     if (itemId == Item.Present)
                                         itmInstance.Data = Item.GetRandomItem().Id;
 
-                                    client.LoggedinUser.Inventory.AddIgnoringFull(itmInstance);
+                                    client.User.Inventory.AddIgnoringFull(itmInstance);
                                 }
                             }
                         }
@@ -245,7 +326,7 @@ namespace HISP.Game.Chat
             }
         msg:;
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
 
@@ -254,8 +335,6 @@ namespace HISP.Game.Chat
             if (args.Length <= 0)
                 return false;
 
-            if (!user.Administrator && !user.Moderator)
-                return false;
 
             try
             {
@@ -276,7 +355,7 @@ namespace HISP.Game.Chat
                 else
                 {
                     User player = findNamePartial(swfUser);
-                    player.LoggedinClient.SendPacket(packetBytes);
+                    player.Client.SendPacket(packetBytes);
                 }
             }
             catch (Exception)
@@ -285,7 +364,7 @@ namespace HISP.Game.Chat
             }
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
 
             return true;
         }
@@ -294,8 +373,6 @@ namespace HISP.Game.Chat
         {
             if(args.Length <= 0)
                 return false;
-            if(!user.Administrator && !user.Moderator)
-                return false;
 
             try{
                 string userName = args[0];
@@ -309,7 +386,7 @@ namespace HISP.Game.Chat
             }
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
 
             return true;
         }
@@ -318,18 +395,17 @@ namespace HISP.Game.Chat
         {
             // Get current version and send to client
             byte[] versionPacket = PacketBuilder.CreateChat(ServerVersion.GetBuildString(), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(versionPacket);
+            user.Client.SendPacket(versionPacket);
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatPlayerCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
         public static bool Ban(string message, string[] args, User user)
         {
             if (args.Length <= 0)
                 return false;
-            if (!user.Administrator && !user.Moderator)
-                return false;
+
             try
             {
                 string userName = args[0];
@@ -349,53 +425,43 @@ namespace HISP.Game.Chat
             }
             try{
                 User bannedUser = GameServer.GetUserByName(args[0]);
-                bannedUser.LoggedinClient.Kick(Messages.KickReasonBanned);
+                bannedUser.Client.Kick(Messages.KickReasonBanned);
             }
             catch(KeyNotFoundException){};
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
 
             return true;
         }
         public static bool Escape(string message, string[] args, User user)
         {
-            if (!user.Administrator && !user.Moderator) 
-                return false;
 
             user.Teleport(Map.ModIsleX, Map.ModIsleY);
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message) + Messages.ModIsleMessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
 
         public static bool Stealth(string message, string[] args, User user)
         {
-            if (!user.Administrator && !user.Moderator)
-                return false;
 
             user.Stealth = !user.Stealth;
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
         public static bool NoClip(string message, string[] args, User user)
         {
-            if (!user.Administrator)
-                return false;
-            
             user.NoClip = !user.NoClip;
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
 
         public static bool Rules(string message, string[] args, User user)
         {
-            if (!user.Administrator && !user.Moderator)
-                return false;
-
             if (args.Length <= 0)
                 return false;
 
@@ -405,7 +471,7 @@ namespace HISP.Game.Chat
 
                 toSend.Teleport(Map.RulesIsleX, Map.RulesIsleY);
                 byte[] studyTheRulesMsg = PacketBuilder.CreateChat(Messages.RulesIsleSentMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                toSend.LoggedinClient.SendPacket(studyTheRulesMsg);
+                toSend.Client.SendPacket(studyTheRulesMsg);
             }
             catch (KeyNotFoundException)
             {
@@ -413,14 +479,12 @@ namespace HISP.Game.Chat
             }
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message)+Messages.FormatRulesCommandMessage(args[0]), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
 
         public static bool Prison(string message, string[] args, User user)
         {
-            if (!user.Administrator && !user.Moderator)
-                return false;
             
             if (args.Length <= 0)
                 return false;
@@ -431,7 +495,7 @@ namespace HISP.Game.Chat
                 
                 toSend.Teleport(Map.PrisonIsleX, Map.PrisonIsleY);
                 byte[] dontDoTheTime = PacketBuilder.CreateChat(Messages.PrisonIsleSentMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                toSend.LoggedinClient.SendPacket(dontDoTheTime);
+                toSend.Client.SendPacket(dontDoTheTime);
             }
             catch (KeyNotFoundException)
             {
@@ -439,14 +503,12 @@ namespace HISP.Game.Chat
             }
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message) + Messages.FormatPrisonCommandMessage(args[0]), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
 
         }
         public static bool Kick(string message, string[] args, User user)
         {
-            if (!user.Administrator && !user.Moderator)
-                return false;
 
             if (args.Length <= 0)
                 return false;
@@ -458,11 +520,11 @@ namespace HISP.Game.Chat
                 if (args.Length >= 2)
                 {
                     string reason = string.Join(" ", args, 1, args.Length - 1);
-                    toKick.LoggedinClient.Kick(reason);
+                    toKick.Client.Kick(reason);
                 }
                 else
                 {
-                    toKick.LoggedinClient.Kick(Messages.KickReasonKicked);
+                    toKick.Client.Kick(Messages.KickReasonKicked);
                 }
             }
             catch (KeyNotFoundException)
@@ -471,15 +533,13 @@ namespace HISP.Game.Chat
             }
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
 
         public static bool Jump(string message, string[] args, User user)
         {
-            if (args.Length <= 2)
-                return false;
-            if (!user.Administrator)
+            if (args.Length < 2)
                 return false;
 
 
@@ -495,7 +555,7 @@ namespace HISP.Game.Chat
             }
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
 
@@ -503,8 +563,6 @@ namespace HISP.Game.Chat
         {
             if (args.Length <= 0)
                 return false;
-            if (!user.Administrator)
-                return false;
 
             int itemId = 0;
             try
@@ -530,7 +588,7 @@ namespace HISP.Game.Chat
             }
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
 
             return true;
         }
@@ -538,8 +596,6 @@ namespace HISP.Game.Chat
         {
             if (args.Length <= 0)
                 return false;
-            if (!user.Administrator)
-                return false;
             if(args[0].ToUpper() == "PLAYER")
             {
                 if(args.Length < 2)
@@ -628,16 +684,13 @@ namespace HISP.Game.Chat
         
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             
             return true;
         }
 
         public static bool ModHorse(string message, string[] args, User user)
         {
-            if (!user.Administrator)
-                return false;
-
             if (args.Length < 3)
                 return false;
 
@@ -708,7 +761,7 @@ namespace HISP.Game.Chat
 
 
             byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message), PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
 
@@ -766,21 +819,19 @@ namespace HISP.Game.Chat
             }                
 
             playSwf:;
-            byte[] swfPacket = PacketBuilder.CreateSwfModule("warpcutscene", PacketBuilder.PACKET_SWF_CUTSCENE);
-            user.LoggedinClient.SendPacket(swfPacket);
+            byte[] swfPacket = PacketBuilder.CreateSwfModule("warpcutscene", PacketBuilder.PACKET_SWF_MODULE_CUTSCENE);
+            user.Client.SendPacket(swfPacket);
 
 
             sendText:;
             byte[] chatPacket = PacketBuilder.CreateChat(formattedmessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
 
             return true;
         }
 
         public static bool CallHorse(string message, string[] args, User user)
         {
-            if (!user.Administrator)
-                return false;
 
             if (args.Length <= 0)
                 return false;
@@ -805,7 +856,7 @@ namespace HISP.Game.Chat
             
 
             byte[] chatPacket = PacketBuilder.CreateChat(formattedmessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
 
         }
@@ -819,16 +870,16 @@ namespace HISP.Game.Chat
             if (replyMessage.Length > 1024)
             {
                 byte[] tooLong = PacketBuilder.CreateChat(Messages.AutoReplyTooLong, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(tooLong);
+                user.Client.SendPacket(tooLong);
 
                 return false;
             }
 
-            Object violationReason = Chat.FilterMessage(replyMessage);
+            Object violationReason = ChatMsg.FilterMessage(replyMessage);
             if (violationReason != null)
             {
                 byte[] hasVios = PacketBuilder.CreateChat(Messages.AutoReplyHasViolations, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(hasVios);
+                user.Client.SendPacket(hasVios);
 
                 return false;
             }
@@ -836,7 +887,7 @@ namespace HISP.Game.Chat
             user.AutoReplyText = replyMessage;
 
             byte[] chatPacket = PacketBuilder.CreateChat(formattedmessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
         }
         public static bool Dance(string message, string[] args, User user)
@@ -850,7 +901,7 @@ namespace HISP.Game.Chat
             user.ActiveDance = new Dance(user, moves);
 
             byte[] chatPacket = PacketBuilder.CreateChat(formattedmessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
             return true;
 
         }
@@ -861,7 +912,7 @@ namespace HISP.Game.Chat
             if(user.InRealTimeQuiz)
             {
                 byte[] cantEnterRealTimeQuiz = PacketBuilder.CreateChat(Messages.EventAlreadyEnteredRealTimeQuiz, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(cantEnterRealTimeQuiz);
+                user.Client.SendPacket(cantEnterRealTimeQuiz);
                 return false;
             }
             if (quizActive)
@@ -873,24 +924,24 @@ namespace HISP.Game.Chat
                 if(participent.Quit)
                 {
                     byte[] quizQuit = PacketBuilder.CreateChat(Messages.EventQuitRealTimeQuiz, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    user.LoggedinClient.SendPacket(quizQuit);
+                    user.Client.SendPacket(quizQuit);
 
                     return false;
                 }
                 
                 participent.UpdateParticipent();
                 byte[] enteredRealTimeQuiz = PacketBuilder.CreateChat(Messages.EventEnteredRealTimeQuiz, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(enteredRealTimeQuiz);
+                user.Client.SendPacket(enteredRealTimeQuiz);
 
                 byte[] chatPacket = PacketBuilder.CreateChat(formattedmessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-                user.LoggedinClient.SendPacket(chatPacket);
+                user.Client.SendPacket(chatPacket);
                 return true;
 
             } 
             else
             {
                 byte[] quizUnavailable = PacketBuilder.CreateChat(Messages.EventUnavailableRealTimeQuiz, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(quizUnavailable);
+                user.Client.SendPacket(quizUnavailable);
                 return false;
             }
 
@@ -969,7 +1020,7 @@ namespace HISP.Game.Chat
             }
             
             byte[] chatPacket = PacketBuilder.CreateChat(formattedmessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
 
             return true;
         }
@@ -1047,7 +1098,7 @@ namespace HISP.Game.Chat
 
 
             byte[] chatPacket = PacketBuilder.CreateChat(formattedmessage, PacketBuilder.CHAT_BOTTOM_LEFT);
-            user.LoggedinClient.SendPacket(chatPacket);
+            user.Client.SendPacket(chatPacket);
 
             return true;
         }

HorseIsleServer/LibHISP/Game/Chat/CommandRegister.cs

@@ -15,19 +15,43 @@ namespace HISP.Game.Chat
                 return registeredComamnds.ToArray();
             }
         }
+        private Func<string, string[], User, bool> commandCallback;
+
+        public bool CmdRequiresAdmin;
+        public bool CmdRequiresMod;
 
         public char CmdLetter;
         public string CmdName;
         public string CmdUsage;
-        public Func<string,string[],User, bool> CmdCallback;
-        public CommandRegister(char cmdLetter, string cmdName, string cmdUsage, Func<string, string[], User, bool> cmdCallback)
+        public CommandRegister(char cmdLetter, string cmdName, string cmdUsage, Func<string, string[], User, bool> cmdCallback, bool cmdRequiresAdmin, bool cmdRequiresMod)
         {
-            CmdLetter = cmdLetter;
-            CmdName = cmdName.ToUpper(CultureInfo.InvariantCulture);
-            CmdCallback = cmdCallback;
-            CmdUsage = cmdUsage;
+            this.CmdLetter = cmdLetter;
+            this.CmdName = cmdName.ToUpper(CultureInfo.InvariantCulture).Trim();
+            this.CmdUsage = cmdUsage;
+
+            this.CmdRequiresMod = cmdRequiresMod;
+            this.CmdRequiresAdmin = cmdRequiresAdmin;
+
+            this.commandCallback = cmdCallback;
 
             registeredComamnds.Add(this);
         }
+
+        public bool HasPermission(User user)
+        {
+            if (CmdRequiresAdmin && !(user.Administrator))
+                return false;
+            if (CmdRequiresMod && !(user.Moderator || user.Administrator))
+                return false;
+
+            return true;
+        }
+
+        public bool Execute(string message, string[] args, User user)
+        {
+            if(HasPermission(user))
+                return commandCallback(message, args, user);
+            return false;
+        }
     }
 }

HorseIsleServer/LibHISP/Game/Events/IsleCardTradingGame.cs

@@ -54,16 +54,16 @@ namespace HISP.Game.Events
                     int totalTypes = 0;
 
                     foreach (int itemId in Item.TradingCards)
-                        if (client.LoggedinUser.Inventory.HasItemId(itemId))
-                            totalCards += client.LoggedinUser.Inventory.GetItemByItemId(itemId).ItemInstances.Length;
+                        if (client.User.Inventory.HasItemId(itemId))
+                            totalCards += client.User.Inventory.GetItemByItemId(itemId).ItemInstances.Length;
 
-                    if (client.LoggedinUser.Inventory.HasItemId(Item.ColtTradingCard))
+                    if (client.User.Inventory.HasItemId(Item.ColtTradingCard))
                         totalTypes++;
-                    if (client.LoggedinUser.Inventory.HasItemId(Item.FillyTradingCard))
+                    if (client.User.Inventory.HasItemId(Item.FillyTradingCard))
                         totalTypes++;
-                    if (client.LoggedinUser.Inventory.HasItemId(Item.MareTradingCard))
+                    if (client.User.Inventory.HasItemId(Item.MareTradingCard))
                         totalTypes++;
-                    if (client.LoggedinUser.Inventory.HasItemId(Item.StallionTradingCard))
+                    if (client.User.Inventory.HasItemId(Item.StallionTradingCard))
                         totalTypes++;
 
                     if(totalCards > 4)
@@ -93,12 +93,12 @@ namespace HISP.Game.Events
                     }
                     else if (totalTypes == 4) 
                     {
-                        client.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.IsleCardsGameWin).Count++;
+                        client.User.TrackedItems.GetTrackedItem(Tracking.TrackableItem.IsleCardsGameWin).Count++;
 
                         byte[] wonIsleCardGame = PacketBuilder.CreateChat(Messages.EventWonIsleTradingGame, PacketBuilder.CHAT_BOTTOM_RIGHT);
                         client.SendPacket(wonIsleCardGame);
 
-                        client.LoggedinUser.AddMoney(25000);
+                        client.User.AddMoney(25000);
 
                     }
 

HorseIsleServer/LibHISP/Game/Events/ModsRevenge.cs

@@ -148,8 +148,8 @@ namespace HISP.Game.Events
                 thrower.AddMoney(50);
                 throwAt.AddMoney(500);
 
-                thrower.LoggedinClient.SendPacket(youEarned);
-                throwAt.LoggedinClient.SendPacket(otherEarned);
+                thrower.Client.SendPacket(youEarned);
+                throwAt.Client.SendPacket(otherEarned);
 
                 throwCounter.AddThrownAt(throwAt);
             }

HorseIsleServer/LibHISP/Game/Events/RandomEvent.cs

@@ -59,7 +59,7 @@ namespace HISP.Game.Events
 
                 string msg = Messages.FormatRandomEvent(rngEvent.Text, moneyEarned, horseName);
                 byte[] chatPacket = PacketBuilder.CreateChat(Messages.RandomEventPrefix + msg, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(chatPacket);
+                user.Client.SendPacket(chatPacket);
 
                 return;
             }

HorseIsleServer/LibHISP/Game/Events/RealTimeQuiz.cs

@@ -48,7 +48,7 @@ namespace HISP.Game.Events
                     return;
 
                 byte[] realTimeQuizQuestion = PacketBuilder.CreateMeta(Meta.BuildRealTimeQuiz(this));
-                this.UserInstance.LoggedinClient.SendPacket(realTimeQuizQuestion);
+                this.UserInstance.Client.SendPacket(realTimeQuizQuestion);
             }
 
             public void CheckAnswer(string answer)
@@ -160,7 +160,7 @@ namespace HISP.Game.Events
                 Participent partcipent = getParticipent(user.Id);
                 partcipent.Quit = true;
                 user.InRealTimeQuiz = false;
-                GameServer.UpdateArea(user.LoggedinClient);
+                GameServer.UpdateArea(user.Client);
             }
             catch (KeyNotFoundException) { };
         }
@@ -219,7 +219,7 @@ namespace HISP.Game.Events
 
 
                 participent.UserInstance.InRealTimeQuiz = false;
-                GameServer.UpdateArea(participent.UserInstance.LoggedinClient);
+                GameServer.UpdateArea(participent.UserInstance.Client);
 
                 int money = 0;
 
@@ -238,12 +238,12 @@ namespace HISP.Game.Events
                 if (participent.Won)
                 {
                     byte[] wonBonusMessage = PacketBuilder.CreateChat(Messages.FormatEventRealTimeQuizWinBonus(money), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    participent.UserInstance.LoggedinClient.SendPacket(wonBonusMessage);
+                    participent.UserInstance.Client.SendPacket(wonBonusMessage);
                 }
                 else 
                 {
                     byte[] bonusMessage = PacketBuilder.CreateChat(Messages.FormatEventRealTimeQuizBonus(money), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    participent.UserInstance.LoggedinClient.SendPacket(bonusMessage);
+                    participent.UserInstance.Client.SendPacket(bonusMessage);
                 }
 
                 participent.UserInstance.AddMoney(money);

HorseIsleServer/LibHISP/Game/Events/RealTimeRiddle.cs

@@ -59,7 +59,7 @@ namespace HISP.Game.Events
             if (Database.HasPlayerCompletedRealTimeRiddle(RiddleId, winner.Id))
             {
                 byte[] alreadyWonRiddleMessage = PacketBuilder.CreateChat(Messages.EventAlreadySovledRealTimeRiddle, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                winner.LoggedinClient.SendPacket(alreadyWonRiddleMessage);
+                winner.Client.SendPacket(alreadyWonRiddleMessage);
                 return;
             }
 
@@ -81,7 +81,7 @@ namespace HISP.Game.Events
             foreach (GameClient client in GameClient.ConnectedClients)
             {
                 if (client.LoggedIn)
-                    if (client.LoggedinUser.Id != winner.Id)
+                    if (client.User.Id != winner.Id)
                         client.SendPacket(riddleWonMessage);
                     else
                         client.SendPacket(riddleYouWonMessage);

HorseIsleServer/LibHISP/Game/Events/WaterBalloonGame.cs

@@ -80,7 +80,7 @@ namespace HISP.Game.Events
             {
                 byte[] youWinMsg = PacketBuilder.CreateChat(Messages.EventWonWaterBallonGame, PacketBuilder.CHAT_BOTTOM_RIGHT);
                 winner.UserHit.AddMoney(20000);
-                winner.UserHit.LoggedinClient.SendPacket(youWinMsg);
+                winner.UserHit.Client.SendPacket(youWinMsg);
                 winner.UserHit.TrackedItems.GetTrackedItem(Tracking.TrackableItem.WaterbaloonGameWin).Count++;
             }
 

HorseIsleServer/LibHISP/Game/Items/Item.cs

@@ -150,7 +150,7 @@ namespace HISP.Game.Items
                         if (isle.Name == "Prison Isle")
                         {
                             byte[] dontWorkHere = PacketBuilder.CreateChat(Messages.RanchDorothyShoesPrisonIsleMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            user.LoggedinClient.SendPacket(dontWorkHere);
+                            user.Client.SendPacket(dontWorkHere);
                             return;
                         }
                     }
@@ -162,14 +162,14 @@ namespace HISP.Game.Items
                         return;
                     }
                     byte[] noPlaceLIke127001 = PacketBuilder.CreateChat(Messages.RanchDorothyShoesMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    user.LoggedinClient.SendPacket(noPlaceLIke127001);
+                    user.Client.SendPacket(noPlaceLIke127001);
 
                     user.Teleport(user.OwnedRanch.X, user.OwnedRanch.Y);
                 }
                 else if (itm.ItemId == Item.Telescope)
                 {
                     byte[] birdMap = PacketBuilder.CreateBirdMap(user.X, user.Y);
-                    user.LoggedinClient.SendPacket(birdMap);
+                    user.Client.SendPacket(birdMap);
                 }
                 else
                 {

HorseIsleServer/LibHISP/Game/Map.cs

@@ -12,7 +12,14 @@ namespace HISP.Game
             public string Type;
         }
 
-        public static int[] OverlayTileDepth;
+        public struct TileDepth
+        {
+            public bool ShowPlayer;
+            public bool Passable;
+        }
+
+        public static TileDepth[] OverlayTileDepth;
+        public static TerrainTile[] TerrainTiles;
 
         public static int Width;
         public static int Height;
@@ -20,8 +27,6 @@ namespace HISP.Game
         public static byte[] MapData;
         public static byte[] oMapData;
 
-        public static TerrainTile[] TerrainTiles;
-        
 
         public static int NewUserStartX;
         public static int NewUserStartY;
@@ -75,19 +80,9 @@ namespace HISP.Game
                 if (World.InIsle(x, y))
                     tileset = World.GetIsle(x, y).Tileset;
                 otileId = otileId + 64 * tileset;
-            }
-            
-
-            int tileDepth = OverlayTileDepth[otileId];
-            bool overlayPassable = false;
-            if (tileDepth == 0)
-                overlayPassable = false;
-            if (tileDepth == 1)
-                overlayPassable = false;
-            if (tileDepth == 2)
-                overlayPassable = true;
-            if (tileDepth == 3)
-                overlayPassable = true;
+            }
+
+            bool overlayPassable = OverlayTileDepth[otileId].Passable;
 
             if ((!terrainPassable && overlayPassable) && otileId == 0)
                 return false;

HorseIsleServer/LibHISP/Game/Meta.cs

@@ -1154,9 +1154,9 @@ namespace HISP.Game
             {
                 if (client.LoggedIn)
                 {
-                    if (client.LoggedinUser.Stealth)
+                    if (client.User.Stealth)
                         continue;
-                    onlineUsers.Add(client.LoggedinUser);
+                    onlineUsers.Add(client.User);
                 }
             }
 
@@ -1189,17 +1189,17 @@ namespace HISP.Game
             {
                 if (client.LoggedIn)
                 {
-                    if (client.LoggedinUser.Stealth)
+                    if (client.User.Stealth)
                         continue;
 
-                    bool isYou = (client.LoggedinUser.Id == currentUser.Id);
+                    bool isYou = (client.User.Id == currentUser.Id);
 
-                    int icon = client.LoggedinUser.GetPlayerListIcon();
+                    int icon = client.User.GetPlayerListIcon();
                     string iconFormat = "";
                     if (icon != -1)
                         iconFormat = Messages.FormatIconFormat(icon);
 
-                    message += Messages.FormatPlayerEntry(iconFormat, client.LoggedinUser.Username, client.LoggedinUser.Id, Convert.ToInt32(Math.Round((DateTime.UtcNow - client.LoggedinUser.LoginTime).TotalMinutes)), client.LoggedinUser.X, client.LoggedinUser.Y, client.LoggedinUser.Idle, currentUser.MutePlayer.IsUserMuted(client.LoggedinUser), isYou);
+                    message += Messages.FormatPlayerEntry(iconFormat, client.User.Username, client.User.Id, Convert.ToInt32(Math.Round((DateTime.UtcNow - client.User.LoginTime).TotalMinutes)), client.User.X, client.User.Y, client.User.Idle, currentUser.MutePlayer.IsUserMuted(client.User), isYou);
                 }
             }
 
@@ -1735,7 +1735,7 @@ namespace HISP.Game
             string swfModule = ranch.GetSwf(mine);
 
             byte[] moduleSwf = PacketBuilder.CreateSwfModule(swfModule, PacketBuilder.PACKET_SWF_MODULE_FORCE);
-            user.LoggedinClient.SendPacket(moduleSwf);
+            user.Client.SendPacket(moduleSwf);
 
             if (mine) // This is My DS.
             {

HorseIsleServer/LibHISP/Game/Multiroom.cs

@@ -84,7 +84,7 @@ namespace HISP.Game
                     if (joinedUser.Id != user.Id)
                         if(!TwoPlayer.IsPlayerInGame(joinedUser))
                             if(!joinedUser.MajorPriority)
-                                GameServer.UpdateArea(joinedUser.LoggedinClient);
+                                GameServer.UpdateArea(joinedUser.Client);
             }
             
         }
@@ -101,7 +101,7 @@ namespace HISP.Game
                 foreach (User joinedUser in JoinedUsers)
                     if (!TwoPlayer.IsPlayerInGame(joinedUser))
                         if (!joinedUser.MajorPriority)
-                            GameServer.UpdateArea(joinedUser.LoggedinClient);
+                            GameServer.UpdateArea(joinedUser.Client);
             }
 
         }

HorseIsleServer/LibHISP/Game/Quest.cs

@@ -238,7 +238,7 @@ namespace HISP.Game
             if (quest.SuccessMessage != null)
             {
                 byte[] ChatPacket = PacketBuilder.CreateChat(quest.SuccessMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(ChatPacket);
+                user.Client.SendPacket(ChatPacket);
             }
 
             if (quest.SuccessNpcChat != null)
@@ -246,7 +246,7 @@ namespace HISP.Game
                 if (!npcActivation)
                 {
                     byte[] ChatPacket = PacketBuilder.CreateChat(quest.SuccessNpcChat, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    user.LoggedinClient.SendPacket(ChatPacket);
+                    user.Client.SendPacket(ChatPacket);
                 }
             }
 
@@ -264,8 +264,8 @@ namespace HISP.Game
             // Is cloud isles quest?
             if (quest.Id == CloudIslesQuest)
             {
-                byte[] swfLoadPacket = PacketBuilder.CreateSwfModule("ballooncutscene", PacketBuilder.PACKET_SWF_CUTSCENE);
-                user.LoggedinClient.SendPacket(swfLoadPacket);
+                byte[] swfLoadPacket = PacketBuilder.CreateSwfModule("ballooncutscene", PacketBuilder.PACKET_SWF_MODULE_CUTSCENE);
+                user.Client.SendPacket(swfLoadPacket);
             }
 
             return res;
@@ -290,7 +290,7 @@ namespace HISP.Game
                 if (!npcActivation)
                 {
                     byte[] ChatPacket = PacketBuilder.CreateChat(quest.FailNpcChat, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    user.LoggedinClient.SendPacket(ChatPacket);
+                    user.Client.SendPacket(ChatPacket);
                 }
                 else
                 {
@@ -371,7 +371,7 @@ namespace HISP.Game
                         if(result.NpcChat != null)
                         {
                             byte[] ChatPacket = PacketBuilder.CreateChat(result.NpcChat, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            user.LoggedinClient.SendPacket(ChatPacket);
+                            user.Client.SendPacket(ChatPacket);
                         }
                         return true;
                     }
@@ -383,7 +383,7 @@ namespace HISP.Game
                 if (result.NpcChat != null)
                 {
                     byte[] ChatPacket = PacketBuilder.CreateChat(result.NpcChat, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    user.LoggedinClient.SendPacket(ChatPacket);
+                    user.Client.SendPacket(ChatPacket);
                 }
                 return true;
             }

HorseIsleServer/LibHISP/Game/Ranch.cs

@@ -1,489 +1,500 @@
-using HISP.Game.Inventory;
-using HISP.Game.Items;
-using HISP.Player;
-using HISP.Server;
+using HISP.Game.Inventory;
+using HISP.Game.Items;
+using HISP.Player;
+using HISP.Server;
 using HISP.Util;
-using System;
-using System.Collections.Generic;
-
-namespace HISP.Game
-{
-    public class Ranch
-    {
-        public class RanchUpgrade
-        {
-            public static List<RanchUpgrade> RanchUpgrades = new List<RanchUpgrade>();
-            public int Id;
-            public int Cost;
-            public string Title;
-            public string Description;
-            public int Limit;
-
-            public static bool RanchUpgradeExists(int id)
-            {
-                foreach (RanchUpgrade rachUpgrade in RanchUpgrades)
-                {
-                    if (rachUpgrade.Id == id)
-                        return true;
-                }
-                return false;
-            }
-            public static RanchUpgrade GetRanchUpgradeById(int id)
-            {
-                foreach (RanchUpgrade rachUpgrade in RanchUpgrades)
-                {
-                    if (rachUpgrade.Id == id)
-                        return rachUpgrade;
-                }
-                throw new KeyNotFoundException("No ranch found.");
-            }
-        }
-        public class RanchBuilding
-        {
-            public static List<RanchBuilding> RanchBuildings = new List<RanchBuilding>();
-            public int Id;
-            public int Cost;
-            public string Title;
-            public string Description;
-
-            public static bool RanchBuildingExists(int id)
-            {
-                foreach (RanchBuilding ranchBuilding in RanchBuildings)
-                {
-                    if (ranchBuilding.Id == id)
-                        return true;
-                }
-                return false;
-            }
-            public static RanchBuilding GetRanchBuildingById(int id)
-            {
-                foreach(RanchBuilding ranchBuilding in RanchBuildings)
-                {
-                    if (ranchBuilding.Id == id)
-                        return ranchBuilding;
-                }
-                throw new KeyNotFoundException("No ranch found.");
-            }
-
-            public int GetTeardownPrice()
-            {
-                return Convert.ToInt32(Math.Round((float)this.Cost / (100 / 35.0)));
-            }
-        }
-        public static List<Ranch> Ranches = new List<Ranch>();
-
-        public int X;
-        public int Y;
-        public int Id;
-        public int Value;
-
-        private int ownerId;        
-        private int upgradedLevel;
-        private int investedMoney;
-        private string title;
-        private string description;
-
-        public int GetSellPrice()
-        {
-            return Convert.ToInt32(Math.Round((double)this.InvestedMoney / (100 / 75.0)));
-        }
-        private void removeDorothyShoes(int Id)
-        {
-            if (Id == -1)
-                return;
-            
-            if(GameServer.IsUserOnline(Id))
-            {
-                User user = GameServer.GetUserById(Id);
-                user.OwnedRanch = null;
-                InventoryItem items = user.Inventory.GetItemByItemId(Item.DorothyShoes);
-                foreach (ItemInstance itm in items.ItemInstances)
-                {
-                    user.Inventory.Remove(itm);
-                }
-            }
-            else
-            {
-                Database.RemoveAllItemTypesFromPlayerInventory(this.Id, Item.DorothyShoes);
-            }
-            
-        }
-        
-        private void deleteRanch()
-        {
-            Database.DeleteRanchOwner(this.Id);
-            removeDorothyShoes(this.ownerId);
-            resetRanch();
-        }
-        private void resetRanch()
-        {
-            title = "";
-            description = "";
-            investedMoney = 0;
-            upgradedLevel = 0;
-            ownerId = -1;
-            for (int i = 0; i < 16; i++)
-                buildings[i] = null;
-        }
-        public int OwnerId
-        {
-            get
-            {
-                if(ownerId != -1)
-                {
-                    if (ConfigReader.AllUsersSubbed || Database.IsUserAdmin(ownerId))
-                        return ownerId;
-
-                    int subExp = Database.GetUserSubscriptionExpireDate(ownerId);
-                    DateTime expTime = Helper.UnixTimeStampToDateTime(subExp);
-                    if ((DateTime.UtcNow.Date - expTime.Date).Days >= 30)
-                    {
-                        int price = GetSellPrice();
-                        try
-                        {
-                            checked
-                            {
-                                Database.SetPlayerMoney(Database.GetPlayerMoney(ownerId) + price, ownerId);    
-                            }
-                        }
-                        catch (OverflowException)
-                        {
-                            Database.SetPlayerMoney(2147483647, ownerId);;
-                        }
-
-                        Database.AddMessageToQueue(ownerId, Messages.FormatRanchForcefullySoldMessage(price));
-                        deleteRanch();
-                        return -1;
-                    }
-
-                }
-                return ownerId;
-                
-            }
-            set
-            {
-                if (value == -1)
-                {
-                    deleteRanch();
-                }
-                else
-                {
-                    if(Database.IsRanchOwned(this.Id))
-                    {
-                        Database.SetRanchOwner(this.Id, ownerId);
-                        removeDorothyShoes(ownerId);
-                    }
-                    else
-                    {
-                        resetRanch();
-                        Database.AddRanch(this.Id, value, "", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-                    }
-                }
-
-                ownerId = value;
-            }
-        }
-
-        public int UpgradedLevel
-        {
-            get
-            {
-                return upgradedLevel;
-            }
-            set
-            {
-                upgradedLevel = value;
-                Database.SetRanchUpgradeLevel(Id, value);
-            }
-        }
-        public int InvestedMoney
-        {
-            get
-            {
-                return investedMoney;
-            }
-            set
-            {
-                investedMoney = value;
-                Database.SetRanchInvestment(Id, value);
-            }
-        }
-        public string Title
-        {
-            get
-            {
-                return title;
-            }
-            set
-            {
-                title = value.Trim();
-                Database.SetRanchTitle(Id, title);
-            }
-        }
-        public string Description
-        {
-            get
-            {
-                return description;
-            }
-            set
-            {
-                description = value.Trim();
-                Database.SetRanchDescription(Id, value);
-            }
-        }
-        
-
-        private RanchBuilding[] buildings = new RanchBuilding[16];
-        public int GetBuildingCount(int buildingId)
-        {
-            int count = 0;
-            foreach(RanchBuilding building in buildings)
-            {
-                if(building != null)
-                    if (building.Id == buildingId)
-                        count++;
-            }
-            return count;
-        }
-        private void updateBuildings()
-        {
-            if (buildings[0] != null)
-                Database.SetRanchBuilding1(this.Id, buildings[0].Id);
-            else
-                Database.SetRanchBuilding1(this.Id, 0);
-            if (buildings[1] != null)
-                Database.SetRanchBuilding2(this.Id, buildings[1].Id);
-            else
-                Database.SetRanchBuilding2(this.Id, 0);
-            if (buildings[2] != null)
-                Database.SetRanchBuilding3(this.Id, buildings[2].Id);
-            else
-                Database.SetRanchBuilding3(this.Id, 0);
-            if (buildings[3] != null)
-                Database.SetRanchBuilding4(this.Id, buildings[3].Id);
-            else
-                Database.SetRanchBuilding4(this.Id, 0);
-            if (buildings[4] != null)
-                Database.SetRanchBuilding5(this.Id, buildings[4].Id);
-            else
-                Database.SetRanchBuilding5(this.Id, 0);
-            if (buildings[5] != null)
-                Database.SetRanchBuilding6(this.Id, buildings[5].Id);
-            else
-                Database.SetRanchBuilding6(this.Id, 0);
-            if (buildings[6] != null)
-                Database.SetRanchBuilding7(this.Id, buildings[6].Id);
-            else
-                Database.SetRanchBuilding7(this.Id, 0);
-            if (buildings[7] != null)
-                Database.SetRanchBuilding8(this.Id, buildings[7].Id);
-            else
-                Database.SetRanchBuilding8(this.Id, 0);
-            if (buildings[8] != null)
-                Database.SetRanchBuilding9(this.Id, buildings[8].Id);
-            else
-                Database.SetRanchBuilding9(this.Id, 0);
-            if (buildings[9] != null)
-                Database.SetRanchBuilding10(this.Id, buildings[9].Id);
-            else
-                Database.SetRanchBuilding10(this.Id, 0);
-            if (buildings[10] != null)
-                Database.SetRanchBuilding11(this.Id, buildings[10].Id);
-            else
-                Database.SetRanchBuilding11(this.Id, 0);
-            if (buildings[11] != null)
-                Database.SetRanchBuilding12(this.Id, buildings[11].Id);
-            else
-                Database.SetRanchBuilding12(this.Id, 0);
-            if (buildings[12] != null)
-                Database.SetRanchBuilding13(this.Id, buildings[12].Id);
-            else
-                Database.SetRanchBuilding13(this.Id, 0);
-            if (buildings[13] != null)
-                Database.SetRanchBuilding14(this.Id, buildings[13].Id);
-            else
-                Database.SetRanchBuilding14(this.Id, 0);
-            if (buildings[14] != null)
-                Database.SetRanchBuilding15(this.Id, buildings[14].Id);
-            else
-                Database.SetRanchBuilding15(this.Id, 0);
-            if (buildings[15] != null)
-                Database.SetRanchBuilding16(this.Id, buildings[15].Id);
-            else
-                Database.SetRanchBuilding16(this.Id, 0);
-        }
-        public RanchBuilding GetBuilding(int buildingId)
-        {
-            if (buildingId < 0)
-                return null;
-
-            if (buildingId >= buildings.Length)
-                return null;
-
-            return buildings[buildingId];
-        }
-        public void SetBuilding(int buildingId, RanchBuilding value)
-        {
-            buildings[buildingId] = value;
-            updateBuildings();
-        }
-
-
-        public string GetSwf(bool mine)
-        {
-            string swf  = "ranchviewer.swf?H=" + (upgradedLevel+1).ToString();
-            for(int i = 0; i < buildings.Length; i++)
-            {
-                swf += "&B" + (i+1).ToString() + "=";
-                if (buildings[i] != null)
-                {
-                    swf += buildings[i].Id.ToString();
-                }
-            }
-            if (mine)
-                swf += "&MINE=1";
-            return swf;
-        }
-        
-
-        public Ranch(int x, int y, int id, int value)
-        {
-            X = x;
-            Y = y;
-            Id = id;
-            Value = value;
-            title = "";
-            description = "";
-            upgradedLevel = 0;
-            ownerId = -1;
-            investedMoney = 0;
-            for (int i = 0; i < 16; i++)
-                buildings[i] = null;
-            bool owned = Database.IsRanchOwned(id);
-            if (owned)
-            {
-                upgradedLevel = Database.GetRanchUpgradeLevel(id);
-                title = Database.GetRanchTitle(id);
-                description = Database.GetRanchDescription(id);
-                ownerId = Database.GetRanchOwner(id);
-                int b1 = Database.GetRanchBuilding1(id);
-                int b2 = Database.GetRanchBuilding2(id);
-                int b3 = Database.GetRanchBuilding3(id);
-                int b4 = Database.GetRanchBuilding4(id);
-                int b5 = Database.GetRanchBuilding5(id);
-                int b6 = Database.GetRanchBuilding6(id);
-                int b7 = Database.GetRanchBuilding7(id);
-                int b8 = Database.GetRanchBuilding8(id);
-                int b9 = Database.GetRanchBuilding9(id);
-                int b10 = Database.GetRanchBuilding10(id);
-                int b11 = Database.GetRanchBuilding11(id);
-                int b12 = Database.GetRanchBuilding12(id);
-                int b13 = Database.GetRanchBuilding13(id);
-                int b14 = Database.GetRanchBuilding14(id);
-                int b15 = Database.GetRanchBuilding15(id);
-                int b16 = Database.GetRanchBuilding16(id);
-
-                if (RanchBuilding.RanchBuildingExists(b1))
-                    buildings[0] = RanchBuilding.GetRanchBuildingById(b1);
-                if (RanchBuilding.RanchBuildingExists(b2))
-                    buildings[1] = RanchBuilding.GetRanchBuildingById(b2);
-                if (RanchBuilding.RanchBuildingExists(b3))
-                    buildings[2] = RanchBuilding.GetRanchBuildingById(b3);
-                if (RanchBuilding.RanchBuildingExists(b4))
-                    buildings[3] = RanchBuilding.GetRanchBuildingById(b4);
-                if (RanchBuilding.RanchBuildingExists(b5))
-                    buildings[4] = RanchBuilding.GetRanchBuildingById(b5);
-                if (RanchBuilding.RanchBuildingExists(b6))
-                    buildings[5] = RanchBuilding.GetRanchBuildingById(b6);
-                if (RanchBuilding.RanchBuildingExists(b7))
-                    buildings[6] = RanchBuilding.GetRanchBuildingById(b7);
-                if (RanchBuilding.RanchBuildingExists(b8))
-                    buildings[7] = RanchBuilding.GetRanchBuildingById(b8);
-                if (RanchBuilding.RanchBuildingExists(b9))
-                    buildings[8] = RanchBuilding.GetRanchBuildingById(b9);
-                if (RanchBuilding.RanchBuildingExists(b10))
-                    buildings[9] = RanchBuilding.GetRanchBuildingById(b10);
-                if (RanchBuilding.RanchBuildingExists(b11))
-                    buildings[10] = RanchBuilding.GetRanchBuildingById(b11);
-                if (RanchBuilding.RanchBuildingExists(b12))
-                    buildings[11] = RanchBuilding.GetRanchBuildingById(b12);
-                if (RanchBuilding.RanchBuildingExists(b13))
-                    buildings[12] = RanchBuilding.GetRanchBuildingById(b13);
-                if (RanchBuilding.RanchBuildingExists(b14))
-                    buildings[13] = RanchBuilding.GetRanchBuildingById(b14);
-                if (RanchBuilding.RanchBuildingExists(b15))
-                    buildings[14] = RanchBuilding.GetRanchBuildingById(b15);
-                if (RanchBuilding.RanchBuildingExists(b16))
-                    buildings[15] = RanchBuilding.GetRanchBuildingById(b16);
-
-
-                InvestedMoney = Database.GetRanchInvestment(id);
-            }
-        }
-
-        public RanchUpgrade GetRanchUpgrade()
-        {
-            return RanchUpgrade.GetRanchUpgradeById(this.upgradedLevel + 1);
-        }
-        public static bool IsRanchHere(int x, int y)
-        {
-            foreach (Ranch ranch in Ranches)
-            {
-                if (ranch.X == x && ranch.Y == y)
-                    return true;
-            }
-            return false;
-        }
-        public static bool RanchExists(int ranchId)
-        {
-            foreach (Ranch ranch in Ranches)
-            {
-                if (ranch.Id == ranchId)
-                    return true;
-            }
-            return false;
-        }
-        public static Ranch GetRanchById(int ranchId)
-        {
-            foreach (Ranch ranch in Ranches)
-            {
-                if (ranch.Id == ranchId)
-                    return ranch;
-            }
-            throw new KeyNotFoundException("No Ranch with id " + ranchId);
-        }
-        public static Ranch GetRanchAt(int x, int y)
-        {
-            foreach(Ranch ranch in Ranches)
-            {
-                if (ranch.X == x && ranch.Y == y)
-                    return ranch;
-            }
-            throw new KeyNotFoundException("No Ranch found at x" + x + " y" + y);
-        }
-
-        public static bool IsRanchOwned(int playerId)
-        {
-            foreach (Ranch ranch in Ranches)
-            {
-                if (ranch.OwnerId == playerId)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-        public static Ranch GetRanchOwnedBy(int playerId)
-        {
-            foreach(Ranch ranch in Ranches)
-            {
-                if(ranch.OwnerId == playerId)
-                {
-                    return ranch;
-                }
-            }
-            throw new KeyNotFoundException("Player " + playerId + " does not own a ranch.");
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+
+namespace HISP.Game
+{
+    public class Ranch
+    {
+        public class RanchUpgrade
+        {
+            public static List<RanchUpgrade> RanchUpgrades = new List<RanchUpgrade>();
+            public int Id;
+            public int Cost;
+            public string Title;
+            public string Description;
+            public int Limit;
+
+            public static bool RanchUpgradeExists(int id)
+            {
+                foreach (RanchUpgrade rachUpgrade in RanchUpgrades)
+                {
+                    if (rachUpgrade.Id == id)
+                        return true;
+                }
+                return false;
+            }
+            public static RanchUpgrade GetRanchUpgradeById(int id)
+            {
+                foreach (RanchUpgrade ranchUpgrade in RanchUpgrades)
+                {
+                    if (ranchUpgrade.Id == id)
+                        return ranchUpgrade;
+                }
+                throw new KeyNotFoundException("No ranch found.");
+            }
+        }
+        public class RanchBuilding
+        {
+            public static List<RanchBuilding> RanchBuildings = new List<RanchBuilding>();
+            public int Id;
+            public int Cost;
+            public string Title;
+            public string Description;
+
+            public static bool RanchBuildingExists(int id)
+            {
+                foreach (RanchBuilding ranchBuilding in RanchBuildings)
+                {
+                    if (ranchBuilding.Id == id)
+                        return true;
+                }
+                return false;
+            }
+            public static RanchBuilding GetRanchBuildingById(int id)
+            {
+                foreach(RanchBuilding ranchBuilding in RanchBuildings)
+                {
+                    if (ranchBuilding.Id == id)
+                        return ranchBuilding;
+                }
+                throw new KeyNotFoundException("No ranch found.");
+            }
+
+            public int GetTeardownPrice()
+            {
+                return Convert.ToInt32(Math.Round((float)this.Cost / (100 / 35.0)));
+            }
+        }
+        public static List<Ranch> Ranches = new List<Ranch>();
+
+        public int X;
+        public int Y;
+        public int Id;
+        public int Value;
+
+        private int ownerId;        
+        private int upgradedLevel;
+        private int investedMoney;
+        private string title;
+        private string description;
+
+        public int GetSellPrice()
+        {
+            return Convert.ToInt32(Math.Round((double)this.InvestedMoney / (100 / 75.0)));
+        }
+        private void removeDorothyShoes(int Id)
+        {
+            if (Id == -1)
+                return;
+            
+            if(GameServer.IsUserOnline(Id))
+            {
+                User user = GameServer.GetUserById(Id);
+                user.OwnedRanch = null;
+                InventoryItem items = user.Inventory.GetItemByItemId(Item.DorothyShoes);
+                foreach (ItemInstance itm in items.ItemInstances)
+                {
+                    user.Inventory.Remove(itm);
+                }
+            }
+            else
+            {
+                Database.RemoveAllItemTypesFromPlayerInventory(this.Id, Item.DorothyShoes);
+            }
+            
+        }
+        
+        private void deleteRanch()
+        {
+            Database.DeleteRanchOwner(this.Id);
+            removeDorothyShoes(this.ownerId);
+            resetRanch();
+        }
+        private void resetRanch()
+        {
+            title = "";
+            description = "";
+            investedMoney = 0;
+            upgradedLevel = 0;
+            ownerId = -1;
+            for (int i = 0; i < 16; i++)
+                buildings[i] = null;
+        }
+        public int OwnerId
+        {
+            get
+            {
+                if(ownerId != -1)
+                {
+                    if (ConfigReader.AllUsersSubbed || Database.GetUserAdmin(ownerId))
+                        return ownerId;
+
+                    int subExp = Database.GetUserSubscriptionExpireDate(ownerId);
+                    DateTime expTime = Helper.UnixTimeStampToDateTime(subExp);
+                    if ((DateTime.UtcNow.Date - expTime.Date).Days >= 30)
+                    {
+                        int price = GetSellPrice();
+                        try
+                        {
+                            checked
+                            {
+                                Database.SetPlayerMoney(Database.GetPlayerMoney(ownerId) + price, ownerId);    
+                            }
+                        }
+                        catch (OverflowException)
+                        {
+                            Database.SetPlayerMoney(2147483647, ownerId);;
+                        }
+
+                        Database.AddMessageToQueue(ownerId, Messages.FormatRanchForcefullySoldMessage(price));
+                        deleteRanch();
+                        return -1;
+                    }
+
+                }
+                return ownerId;
+                
+            }
+            set
+            {
+                if (value == -1)
+                {
+                    deleteRanch();
+                }
+                else
+                {
+                    if (Database.IsRanchOwned(this.Id))
+                    {
+                        Database.SetRanchOwner(this.Id, ownerId);
+                        removeDorothyShoes(ownerId);
+                    }
+                    else
+                    {
+                        resetRanch();
+                        Database.AddRanch(this.Id, value, "", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                    }
+                }
+
+                if (GameServer.IsUserOnline(value))
+                {
+                    User user = GameServer.GetUserById(value);
+                    user.OwnedRanch = this;
+                    user.Inventory.AddIgnoringFull(new ItemInstance(Item.DorothyShoes));
+                }
+                else
+                {
+                    Database.AddItemToInventory(value, new ItemInstance(Item.DorothyShoes));
+                }
+
+                ownerId = value;
+            }
+        }
+
+        public int UpgradedLevel
+        {
+            get
+            {
+                return upgradedLevel;
+            }
+            set
+            {
+                upgradedLevel = value;
+                Database.SetRanchUpgradeLevel(Id, value);
+            }
+        }
+        public int InvestedMoney
+        {
+            get
+            {
+                return investedMoney;
+            }
+            set
+            {
+                investedMoney = value;
+                Database.SetRanchInvestment(Id, value);
+            }
+        }
+        public string Title
+        {
+            get
+            {
+                return title;
+            }
+            set
+            {
+                title = value.Trim();
+                Database.SetRanchTitle(Id, title);
+            }
+        }
+        public string Description
+        {
+            get
+            {
+                return description;
+            }
+            set
+            {
+                description = value.Trim();
+                Database.SetRanchDescription(Id, value);
+            }
+        }
+        
+
+        private RanchBuilding[] buildings = new RanchBuilding[16];
+        public int GetBuildingCount(int buildingId)
+        {
+            int count = 0;
+            foreach(RanchBuilding building in buildings)
+            {
+                if(building != null)
+                    if (building.Id == buildingId)
+                        count++;
+            }
+            return count;
+        }
+        private void updateBuildings()
+        {
+            if (buildings[0] != null)
+                Database.SetRanchBuilding1(this.Id, buildings[0].Id);
+            else
+                Database.SetRanchBuilding1(this.Id, 0);
+            if (buildings[1] != null)
+                Database.SetRanchBuilding2(this.Id, buildings[1].Id);
+            else
+                Database.SetRanchBuilding2(this.Id, 0);
+            if (buildings[2] != null)
+                Database.SetRanchBuilding3(this.Id, buildings[2].Id);
+            else
+                Database.SetRanchBuilding3(this.Id, 0);
+            if (buildings[3] != null)
+                Database.SetRanchBuilding4(this.Id, buildings[3].Id);
+            else
+                Database.SetRanchBuilding4(this.Id, 0);
+            if (buildings[4] != null)
+                Database.SetRanchBuilding5(this.Id, buildings[4].Id);
+            else
+                Database.SetRanchBuilding5(this.Id, 0);
+            if (buildings[5] != null)
+                Database.SetRanchBuilding6(this.Id, buildings[5].Id);
+            else
+                Database.SetRanchBuilding6(this.Id, 0);
+            if (buildings[6] != null)
+                Database.SetRanchBuilding7(this.Id, buildings[6].Id);
+            else
+                Database.SetRanchBuilding7(this.Id, 0);
+            if (buildings[7] != null)
+                Database.SetRanchBuilding8(this.Id, buildings[7].Id);
+            else
+                Database.SetRanchBuilding8(this.Id, 0);
+            if (buildings[8] != null)
+                Database.SetRanchBuilding9(this.Id, buildings[8].Id);
+            else
+                Database.SetRanchBuilding9(this.Id, 0);
+            if (buildings[9] != null)
+                Database.SetRanchBuilding10(this.Id, buildings[9].Id);
+            else
+                Database.SetRanchBuilding10(this.Id, 0);
+            if (buildings[10] != null)
+                Database.SetRanchBuilding11(this.Id, buildings[10].Id);
+            else
+                Database.SetRanchBuilding11(this.Id, 0);
+            if (buildings[11] != null)
+                Database.SetRanchBuilding12(this.Id, buildings[11].Id);
+            else
+                Database.SetRanchBuilding12(this.Id, 0);
+            if (buildings[12] != null)
+                Database.SetRanchBuilding13(this.Id, buildings[12].Id);
+            else
+                Database.SetRanchBuilding13(this.Id, 0);
+            if (buildings[13] != null)
+                Database.SetRanchBuilding14(this.Id, buildings[13].Id);
+            else
+                Database.SetRanchBuilding14(this.Id, 0);
+            if (buildings[14] != null)
+                Database.SetRanchBuilding15(this.Id, buildings[14].Id);
+            else
+                Database.SetRanchBuilding15(this.Id, 0);
+            if (buildings[15] != null)
+                Database.SetRanchBuilding16(this.Id, buildings[15].Id);
+            else
+                Database.SetRanchBuilding16(this.Id, 0);
+        }
+        public RanchBuilding GetBuilding(int buildingId)
+        {
+            if (buildingId < 0)
+                return null;
+
+            if (buildingId >= buildings.Length)
+                return null;
+
+            return buildings[buildingId];
+        }
+        public void SetBuilding(int buildingId, RanchBuilding value)
+        {
+            buildings[buildingId] = value;
+            updateBuildings();
+        }
+
+
+        public string GetSwf(bool mine)
+        {
+            string swf  = "ranchviewer.swf?H=" + (upgradedLevel+1).ToString();
+            for(int i = 0; i < buildings.Length; i++)
+            {
+                swf += "&B" + (i+1).ToString() + "=";
+                if (buildings[i] != null)
+                {
+                    swf += buildings[i].Id.ToString();
+                }
+            }
+            if (mine)
+                swf += "&MINE=1";
+            return swf;
+        }
+        
+
+        public Ranch(int x, int y, int id, int value)
+        {
+            X = x;
+            Y = y;
+            Id = id;
+            Value = value;
+            title = "";
+            description = "";
+            upgradedLevel = 0;
+            ownerId = -1;
+            investedMoney = 0;
+            for (int i = 0; i < 16; i++)
+                buildings[i] = null;
+            bool owned = Database.IsRanchOwned(id);
+            if (owned)
+            {
+                upgradedLevel = Database.GetRanchUpgradeLevel(id);
+                title = Database.GetRanchTitle(id);
+                description = Database.GetRanchDescription(id);
+                ownerId = Database.GetRanchOwner(id);
+                int b1 = Database.GetRanchBuilding1(id);
+                int b2 = Database.GetRanchBuilding2(id);
+                int b3 = Database.GetRanchBuilding3(id);
+                int b4 = Database.GetRanchBuilding4(id);
+                int b5 = Database.GetRanchBuilding5(id);
+                int b6 = Database.GetRanchBuilding6(id);
+                int b7 = Database.GetRanchBuilding7(id);
+                int b8 = Database.GetRanchBuilding8(id);
+                int b9 = Database.GetRanchBuilding9(id);
+                int b10 = Database.GetRanchBuilding10(id);
+                int b11 = Database.GetRanchBuilding11(id);
+                int b12 = Database.GetRanchBuilding12(id);
+                int b13 = Database.GetRanchBuilding13(id);
+                int b14 = Database.GetRanchBuilding14(id);
+                int b15 = Database.GetRanchBuilding15(id);
+                int b16 = Database.GetRanchBuilding16(id);
+
+                if (RanchBuilding.RanchBuildingExists(b1))
+                    buildings[0] = RanchBuilding.GetRanchBuildingById(b1);
+                if (RanchBuilding.RanchBuildingExists(b2))
+                    buildings[1] = RanchBuilding.GetRanchBuildingById(b2);
+                if (RanchBuilding.RanchBuildingExists(b3))
+                    buildings[2] = RanchBuilding.GetRanchBuildingById(b3);
+                if (RanchBuilding.RanchBuildingExists(b4))
+                    buildings[3] = RanchBuilding.GetRanchBuildingById(b4);
+                if (RanchBuilding.RanchBuildingExists(b5))
+                    buildings[4] = RanchBuilding.GetRanchBuildingById(b5);
+                if (RanchBuilding.RanchBuildingExists(b6))
+                    buildings[5] = RanchBuilding.GetRanchBuildingById(b6);
+                if (RanchBuilding.RanchBuildingExists(b7))
+                    buildings[6] = RanchBuilding.GetRanchBuildingById(b7);
+                if (RanchBuilding.RanchBuildingExists(b8))
+                    buildings[7] = RanchBuilding.GetRanchBuildingById(b8);
+                if (RanchBuilding.RanchBuildingExists(b9))
+                    buildings[8] = RanchBuilding.GetRanchBuildingById(b9);
+                if (RanchBuilding.RanchBuildingExists(b10))
+                    buildings[9] = RanchBuilding.GetRanchBuildingById(b10);
+                if (RanchBuilding.RanchBuildingExists(b11))
+                    buildings[10] = RanchBuilding.GetRanchBuildingById(b11);
+                if (RanchBuilding.RanchBuildingExists(b12))
+                    buildings[11] = RanchBuilding.GetRanchBuildingById(b12);
+                if (RanchBuilding.RanchBuildingExists(b13))
+                    buildings[12] = RanchBuilding.GetRanchBuildingById(b13);
+                if (RanchBuilding.RanchBuildingExists(b14))
+                    buildings[13] = RanchBuilding.GetRanchBuildingById(b14);
+                if (RanchBuilding.RanchBuildingExists(b15))
+                    buildings[14] = RanchBuilding.GetRanchBuildingById(b15);
+                if (RanchBuilding.RanchBuildingExists(b16))
+                    buildings[15] = RanchBuilding.GetRanchBuildingById(b16);
+
+
+                InvestedMoney = Database.GetRanchInvestment(id);
+            }
+        }
+
+        public RanchUpgrade GetRanchUpgrade()
+        {
+            return RanchUpgrade.GetRanchUpgradeById(this.upgradedLevel + 1);
+        }
+        public static bool IsRanchHere(int x, int y)
+        {
+            foreach (Ranch ranch in Ranches)
+            {
+                if (ranch.X == x && ranch.Y == y)
+                    return true;
+            }
+            return false;
+        }
+        public static bool RanchExists(int ranchId)
+        {
+            foreach (Ranch ranch in Ranches)
+            {
+                if (ranch.Id == ranchId)
+                    return true;
+            }
+            return false;
+        }
+        public static Ranch GetRanchById(int ranchId)
+        {
+            foreach (Ranch ranch in Ranches)
+            {
+                if (ranch.Id == ranchId)
+                    return ranch;
+            }
+            throw new KeyNotFoundException("No Ranch with id " + ranchId);
+        }
+        public static Ranch GetRanchAt(int x, int y)
+        {
+            foreach(Ranch ranch in Ranches)
+            {
+                if (ranch.X == x && ranch.Y == y)
+                    return ranch;
+            }
+            throw new KeyNotFoundException("No Ranch found at x" + x + " y" + y);
+        }
+
+        public static bool GetOwnedRanch(int playerId)
+        {
+            foreach (Ranch ranch in Ranches)
+            {
+                if (ranch.OwnerId == playerId)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static Ranch GetRanchOwnedBy(int playerId)
+        {
+            foreach(Ranch ranch in Ranches)
+            {
+                if(ranch.OwnerId == playerId)
+                {
+                    return ranch;
+                }
+            }
+            throw new KeyNotFoundException("Player " + playerId + " does not own a ranch.");
+        }
+    }
+}

HorseIsleServer/LibHISP/Game/Riddler.cs

@@ -32,7 +32,7 @@ namespace HISP.Game
                 Database.CompleteRiddle(this.Id, user.Id);
 
             byte[] riddleAnswerCorrectPacket = PacketBuilder.CreateChat(Messages.FormatRiddlerAnswerCorrect(this.Reason), PacketBuilder.CHAT_BOTTOM_RIGHT);
-            user.LoggedinClient.SendPacket(riddleAnswerCorrectPacket);
+            user.Client.SendPacket(riddleAnswerCorrectPacket);
             user.AddMoney(10000);
 
             if(HasCompletedAllRiddles(user))
@@ -42,7 +42,7 @@ namespace HISP.Game
         public void AnswerFail(User user)
         {
             byte[] riddleIncorrect = PacketBuilder.CreateChat(Messages.RiddlerIncorrectAnswer, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            user.LoggedinClient.SendPacket(riddleIncorrect);
+            user.Client.SendPacket(riddleIncorrect);
         }
 
         public bool CheckAnswer(User user, string txt)

HorseIsleServer/LibHISP/Game/Services/Auction.cs

@@ -38,7 +38,7 @@ namespace HISP.Game.Services
                 if(BidUser.HorseInventory.HorseList.Length >= BidUser.MaxHorses)
                 {
                     byte[] tooManyHorses = PacketBuilder.CreateChat(Messages.AuctionYouHaveTooManyHorses, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    BidUser.LoggedinClient.SendPacket(tooManyHorses);
+                    BidUser.Client.SendPacket(tooManyHorses);
                     return;
                 }
 
@@ -47,7 +47,7 @@ namespace HISP.Game.Services
                 if(BidAmount >= MAX_BID)
                 {
                     byte[] maxBidReached = PacketBuilder.CreateChat(Messages.AuctionBidMax, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    BidUser.LoggedinClient.SendPacket(maxBidReached);
+                    BidUser.Client.SendPacket(maxBidReached);
                     return;
                 }
 
@@ -56,7 +56,7 @@ namespace HISP.Game.Services
                 {
 
                     byte[] cantAffordBid = PacketBuilder.CreateChat(Messages.AuctionCantAffordBid, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                    BidUser.LoggedinClient.SendPacket(cantAffordBid);
+                    BidUser.Client.SendPacket(cantAffordBid);
                     return;
                 }
 
@@ -78,7 +78,7 @@ namespace HISP.Game.Services
                             if(entry.RandomId != AuctionItem.RandomId && entry.HighestBidder == BidUser.Id)
                             {
                                 byte[] cantWinTooMuch = PacketBuilder.CreateChat(Messages.AuctionOnlyOneWinningBidAllowed, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                                BidUser.LoggedinClient.SendPacket(cantWinTooMuch);
+                                BidUser.Client.SendPacket(cantWinTooMuch);
                                 return;
                             }
                         }
@@ -92,7 +92,7 @@ namespace HISP.Game.Services
                         {
                             User oldBidder = GameServer.GetUserById(AuctionItem.HighestBidder);
                             byte[] outbidMessage = PacketBuilder.CreateChat(Messages.FormatAuctionYourOutbidBy(BidUser.Username, AuctionItem.HighestBid), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            oldBidder.LoggedinClient.SendPacket(outbidMessage);
+                            oldBidder.Client.SendPacket(outbidMessage);
                         }
                     }
 
@@ -105,7 +105,7 @@ namespace HISP.Game.Services
                 }
 
                 byte[] bidPlacedMsg = PacketBuilder.CreateChat(yourBidRaisedTo, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                BidUser.LoggedinClient.SendPacket(bidPlacedMsg);
+                BidUser.Client.SendPacket(bidPlacedMsg);
 
             }
 
@@ -152,7 +152,7 @@ namespace HISP.Game.Services
                                 User auctionRunner = GameServer.GetUserById(highestBidder);
                                 auctionRunner.HorseInventory.UnHide(Horse.RandomId);
                                 byte[] notSold = PacketBuilder.CreateChat(Messages.AuctionNoHorseBrought, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                                auctionRunner.LoggedinClient.SendPacket(notSold);
+                                auctionRunner.Client.SendPacket(notSold);
                             }
                             return;
                         }
@@ -162,7 +162,7 @@ namespace HISP.Game.Services
                         {
                             User userWon = GameServer.GetUserById(highestBidder);
                             byte[] wonAuction = PacketBuilder.CreateChat(Messages.FormatAuctionBroughtHorse(highestBid), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            userWon.LoggedinClient.SendPacket(wonAuction);
+                            userWon.Client.SendPacket(wonAuction);
                             userWon.TakeMoney(highestBid);
                             userWon.HorseInventory.AddHorse(Horse, false);
                         }
@@ -175,7 +175,7 @@ namespace HISP.Game.Services
                         {
                             User userSold = GameServer.GetUserById(OwnerId);
                             byte[] horseSold = PacketBuilder.CreateChat(Messages.FormatAuctionHorseSold(highestBid), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            userSold.LoggedinClient.SendPacket(horseSold);
+                            userSold.Client.SendPacket(horseSold);
                             userSold.AddMoney(highestBid);
                             userSold.HorseInventory.DeleteHorse(Horse, false);
                         }

HorseIsleServer/LibHISP/Game/Services/Shop.cs

@@ -24,7 +24,7 @@ namespace HISP.Game.Services
                 if (Item.ItemIdExist(stock))
                     this.Inventory.AddInfinity(Item.GetItemById(stock));
                 else
-                    Logger.WarnPrint("Item ID: " + stock + " Does not exist.");
+                    Logger.WarnPrint("Item ID: " + stock + " doesn't exist, but shop " + id + " stocks it");
             }
 
             ItemInstance[] instances = Database.GetShopInventory(this.Id);

HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs

@@ -156,7 +156,7 @@ namespace HISP.Game.SwfModules
 
             foreach(int room in rooms)
             {
-                Logger.InfoPrint("Loading poetry room: " + room.ToString());
+                Logger.InfoPrint("Loading Poetry room: " + room.ToString());
                 poetryRooms.Add(getPoetryRoom(room));
                 if (!Database.LastPlayerExist("P" + room))
                     Database.AddLastPlayer("P" + room, -1);

HorseIsleServer/LibHISP/Game/Treasure.cs

@@ -139,15 +139,15 @@ namespace HISP.Game
             Database.DeleteTreasure(this.RandomId);
             GenerateTreasure();
 
-            byte[] MovementPacket = PacketBuilder.CreateMovementPacket(user.X, user.Y, user.CharacterId, user.Facing, PacketBuilder.DIRECTION_TELEPORT, true);
-            user.LoggedinClient.SendPacket(MovementPacket);
+            byte[] MovementPacket = PacketBuilder.CreateMovement(user.X, user.Y, user.CharacterId, user.Facing, PacketBuilder.DIRECTION_TELEPORT, true);
+            user.Client.SendPacket(MovementPacket);
 
             user.AddMoney(Value);
 
             if(this.Type == "BURIED")
             {
                 byte[] treasureReceivedPacket = PacketBuilder.CreateChat(Messages.FormatPirateTreasure(this.Value), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(treasureReceivedPacket);
+                user.Client.SendPacket(treasureReceivedPacket);
                 user.TrackedItems.GetTrackedItem(Tracking.TrackableItem.PirateTreasure).Count++;
                 
                 if(user.TrackedItems.GetTrackedItem(Tracking.TrackableItem.PirateTreasure).Count >= 10)
@@ -159,7 +159,7 @@ namespace HISP.Game
             else if(this.Type == "RAINBOW")
             {
                 byte[] treasureReceivedPacket = PacketBuilder.CreateChat(Messages.FormatPotOfGold(this.Value), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                user.LoggedinClient.SendPacket(treasureReceivedPacket);
+                user.Client.SendPacket(treasureReceivedPacket);
                 
                 user.TrackedItems.GetTrackedItem(Tracking.TrackableItem.PotOfGold).Count++;
 

HorseIsleServer/LibHISP/Game/TwoPlayer.cs

@@ -86,8 +86,8 @@ namespace HISP.Game
             byte[] youHaveInvited = PacketBuilder.CreateChat(Messages.Format2PlayerYouInvited(inviting.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
             byte[] yourInvited = PacketBuilder.CreateChat(Messages.Format2PlayerYourInvited(invitee.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
 
-            Invitee.LoggedinClient.SendPacket(youHaveInvited);
-            Inviting.LoggedinClient.SendPacket(yourInvited);
+            Invitee.Client.SendPacket(youHaveInvited);
+            Inviting.Client.SendPacket(yourInvited);
 
             deleteTimer = new Timer(new TimerCallback(deleteTwoPlayer), null, 2 * 60 * 1000, 2 * 60 * 1000);
 
@@ -119,15 +119,15 @@ namespace HISP.Game
 
         private void update()
         {
-            GameServer.UpdateArea(Invitee.LoggedinClient);
-            GameServer.UpdateArea(Inviting.LoggedinClient);
+            GameServer.UpdateArea(Invitee.Client);
+            GameServer.UpdateArea(Inviting.Client);
         }
         private void updateOthers()
         {
             foreach(User user in this.Multiroom.JoinedUsers)
                 if (IsPlayerInGame(user))
                     if(user.Id != Invitee.Id && user.Id != Inviting.Id)
-                        GameServer.UpdateArea(user.LoggedinClient);
+                        GameServer.UpdateArea(user.Client);
             
         }
         public void UpdateAll()
@@ -182,14 +182,14 @@ namespace HISP.Game
                 byte[] startingUpGameInvitee = PacketBuilder.CreateChat(Messages.Format2PlayerStartingGame(Inviting.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
                 byte[] startingUpGameInvited = PacketBuilder.CreateChat(Messages.Format2PlayerStartingGame(Invitee.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
 
-                Invitee.LoggedinClient.SendPacket(startingUpGameInvitee);
-                Inviting.LoggedinClient.SendPacket(startingUpGameInvited);
+                Invitee.Client.SendPacket(startingUpGameInvitee);
+                Inviting.Client.SendPacket(startingUpGameInvited);
 
                 byte[] loadSwfInvitee = PacketBuilder.CreateSwfModule(buildSwf(2), PacketBuilder.PACKET_SWF_MODULE_FORCE);
                 byte[] loadSwfInvited = PacketBuilder.CreateSwfModule(buildSwf(1), PacketBuilder.PACKET_SWF_MODULE_FORCE);
 
-                Invitee.LoggedinClient.SendPacket(loadSwfInvitee);
-                Inviting.LoggedinClient.SendPacket(loadSwfInvited);
+                Invitee.Client.SendPacket(loadSwfInvitee);
+                Inviting.Client.SendPacket(loadSwfInvited);
 
             }
         }
@@ -207,13 +207,13 @@ namespace HISP.Game
 
                     if (userWhoClosed.Id == Inviting.Id)
                     {
-                        Invitee.LoggedinClient.SendPacket(gameClosedByOther);
-                        Inviting.LoggedinClient.SendPacket(gameClosed);
+                        Invitee.Client.SendPacket(gameClosedByOther);
+                        Inviting.Client.SendPacket(gameClosed);
                     }
                     else if (userWhoClosed.Id == Invitee.Id)
                     {
-                        Invitee.LoggedinClient.SendPacket(gameClosed);
-                        Inviting.LoggedinClient.SendPacket(gameClosedByOther);
+                        Invitee.Client.SendPacket(gameClosed);
+                        Inviting.Client.SendPacket(gameClosedByOther);
                     }
                 }
 

HorseIsleServer/LibHISP/Game/World.cs

@@ -74,7 +74,7 @@ namespace HISP.Game
                     Database.SetWeather(Name, value);
                     foreach(User user in GameServer.GetUsersInIsle(this,true,true))
                     {
-                        GameServer.UpdateWorld(user.LoggedinClient);
+                        GameServer.UpdateWorld(user.Client);
                     }
                 }
             }
@@ -127,7 +127,7 @@ namespace HISP.Game
                     Database.SetWeather(Name, value);
                     foreach (User user in GameServer.GetUsersInTown(this, true, true))
                     {
-                        GameServer.UpdateArea(user.LoggedinClient);
+                        GameServer.UpdateArea(user.Client);
                     }
                 }
 

HorseIsleServer/LibHISP/LibHISP.csproj

@@ -28,9 +28,9 @@
     </ContentWithTargetPath>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.7" />
-    <PackageReference Include="MySqlConnector" Version="2.1.11" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.4" />
+    <PackageReference Include="MySqlConnector" Version="2.2.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
@@ -42,7 +42,7 @@
     <GenerateBindingRedirectsOutputType>false</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NoWin32Manifest>true</NoWin32Manifest>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
@@ -57,7 +57,13 @@
     <WarningLevel>3</WarningLevel>
     <NoWarn>1701;1702;2026;IL2026</NoWarn>
   </PropertyGroup>
-    
+  <PropertyGroup>
+  	
+	<TrimMode>partial</TrimMode>
+	<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+	<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
+	
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows|x86'">
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <Optimize>true</Optimize>

HorseIsleServer/LibHISP/Player/Award.cs

@@ -1,100 +1,100 @@
-using HISP.Server;
+using HISP.Server;
 using HISP.Util;
-using System;
-using System.Collections.Generic;
-
-namespace HISP.Player
-{
-    public class Award
-    {
-        public struct AwardEntry
-        {
-            public int Id;
-            public int Sort;
-            public string Title;
-            public int IconId;
-            public int MoneyBonus;
-            public string CompletionText;
-            public string Description;
-        }
-
-        public static AwardEntry[] GlobalAwardList;
-
-        public static AwardEntry GetAwardById(int id)
-        {
-            //99% fo the time this will work
-            try
-            {
-                AwardEntry award = GlobalAwardList[id - 1];
-                if (award.Id == id)
-                    return award;
-            }
-            catch (Exception) { };
-
-            // Incase it doesnt...
-            foreach(AwardEntry award in GlobalAwardList)
-            {
-                if (award.Id == id)
-                    return award;
-            }
-
-            throw new KeyNotFoundException("Award ID " + id + " Does not exist.");
-        }
-
-
-        private ThreadSafeList<AwardEntry> awardsEarned;
-        private User baseUser;
-        public AwardEntry[] AwardsEarned
-        {
-            get
-            {
-                return awardsEarned.ToArray();
-            }
-        }
-
-        public bool HasAward(AwardEntry award)
-        {
-            foreach(AwardEntry awardEntry in AwardsEarned)
-            {
-                if (awardEntry.Id == award.Id)
-                    return true;
-            }
-            return false;
-        }
-
-        public void AddAward(AwardEntry award,bool addToDatabase=true)
-        {
-            if (HasAward(award))
-                return;
-
-            if (addToDatabase)
-            {
-                Database.AddAward(baseUser.Id, award.Id);
-
-                baseUser.AddMoney(award.MoneyBonus);
-
-                byte[] chatPacket = PacketBuilder.CreateChat(award.CompletionText, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                baseUser.LoggedinClient.SendPacket(chatPacket);
-            }
-                
-
-            awardsEarned.Add(award);
-        }
-
-        public Award(User user)
-        {
-            baseUser = user;
-            int[] awards = Database.GetAwards(user.Id);
-            awardsEarned = new ThreadSafeList<AwardEntry>();
-
-            foreach (int awardid in awards)
-            {
-                AddAward(GetAwardById(awardid), false);
-            }
-
-        }
-
-
-
-    }
-}
+using System;
+using System.Collections.Generic;
+
+namespace HISP.Player
+{
+    public class Award
+    {
+        public struct AwardEntry
+        {
+            public int Id;
+            public int Sort;
+            public string Title;
+            public int IconId;
+            public int MoneyBonus;
+            public string CompletionText;
+            public string Description;
+        }
+
+        public static AwardEntry[] GlobalAwardList;
+
+        public static AwardEntry GetAwardById(int id)
+        {
+            //99% fo the time this will work
+            try
+            {
+                AwardEntry award = GlobalAwardList[id - 1];
+                if (award.Id == id)
+                    return award;
+            }
+            catch (Exception) { };
+
+            // Incase it doesnt...
+            foreach(AwardEntry award in GlobalAwardList)
+            {
+                if (award.Id == id)
+                    return award;
+            }
+
+            throw new KeyNotFoundException("Award ID " + id + " Does not exist.");
+        }
+
+
+        private ThreadSafeList<AwardEntry> awardsEarned;
+        private User baseUser;
+        public AwardEntry[] AwardsEarned
+        {
+            get
+            {
+                return awardsEarned.ToArray();
+            }
+        }
+
+        public bool HasAward(AwardEntry award)
+        {
+            foreach(AwardEntry awardEntry in AwardsEarned)
+            {
+                if (awardEntry.Id == award.Id)
+                    return true;
+            }
+            return false;
+        }
+
+        public void AddAward(AwardEntry award,bool addToDatabase=true)
+        {
+            if (HasAward(award))
+                return;
+
+            if (addToDatabase)
+            {
+                Database.AddAward(baseUser.Id, award.Id);
+
+                baseUser.AddMoney(award.MoneyBonus);
+
+                byte[] chatPacket = PacketBuilder.CreateChat(award.CompletionText, PacketBuilder.CHAT_BOTTOM_RIGHT);
+                baseUser.Client.SendPacket(chatPacket);
+            }
+                
+
+            awardsEarned.Add(award);
+        }
+
+        public Award(User user)
+        {
+            baseUser = user;
+            int[] awards = Database.GetAwards(user.Id);
+            awardsEarned = new ThreadSafeList<AwardEntry>();
+
+            foreach (int awardid in awards)
+            {
+                AddAward(GetAwardById(awardid), false);
+            }
+
+        }
+
+
+
+    }
+}

HorseIsleServer/LibHISP/Player/Dance.cs

@@ -62,8 +62,8 @@ namespace HISP.Player
 
             baseUser.Facing = direction + (onHorse * 5);
 
-            byte[] moveResponse = PacketBuilder.CreateMovementPacket(baseUser.X, baseUser.Y, baseUser.CharacterId, baseUser.Facing, PacketBuilder.DIRECTION_NONE, false);
-            baseUser.LoggedinClient.SendPacket(moveResponse);
+            byte[] moveResponse = PacketBuilder.CreateMovement(baseUser.X, baseUser.Y, baseUser.CharacterId, baseUser.Facing, PacketBuilder.DIRECTION_NONE, false);
+            baseUser.Client.SendPacket(moveResponse);
 
             GameServer.UpdateUserFacingAndLocation(baseUser);
 

HorseIsleServer/LibHISP/Player/Friends.cs

@@ -77,19 +77,19 @@ namespace HISP.Player
             if(baseUser.MuteBuddy)
             {
                 byte[] cantFriend = PacketBuilder.CreateChat(Messages.CantSendBuddyRequestWhileMuted, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                baseUser.LoggedinClient.SendPacket(cantFriend);
+                baseUser.Client.SendPacket(cantFriend);
                 return;
             }
             else if(userToFriend.MuteBuddyRequests)
             {
                 byte[] cantFriend = PacketBuilder.CreateChat(Messages.PlayerIgnoringAllBuddyRequests, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                baseUser.LoggedinClient.SendPacket(cantFriend);
+                baseUser.Client.SendPacket(cantFriend);
                 return;
             }
             else if(userToFriend.MutePlayer.IsUserMuted(userToFriend))
             {
                 byte[] cantFriend = PacketBuilder.CreateChat(Messages.PlayerIgnoringYourBuddyRequests, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                baseUser.LoggedinClient.SendPacket(cantFriend);
+                baseUser.Client.SendPacket(cantFriend);
                 return;
             }
 
@@ -102,23 +102,23 @@ namespace HISP.Player
                 byte[] nowFriendsMsg = PacketBuilder.CreateChat(Messages.FormatAddBuddyConfirmed(userToFriend.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
                 byte[] nowFriendsOther = PacketBuilder.CreateChat(Messages.FormatAddBuddyConfirmed(baseUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
 
-                userToFriend.LoggedinClient.SendPacket(nowFriendsOther);
-                baseUser.LoggedinClient.SendPacket(nowFriendsMsg);
+                userToFriend.Client.SendPacket(nowFriendsOther);
+                baseUser.Client.SendPacket(nowFriendsMsg);
 
                 if(!baseUser.MajorPriority)
-                    GameServer.UpdateArea(baseUser.LoggedinClient);
+                    GameServer.UpdateArea(baseUser.Client);
 
                 if (!userToFriend.MajorPriority)
-                    GameServer.UpdateArea(userToFriend.LoggedinClient);
+                    GameServer.UpdateArea(userToFriend.Client);
             }
             else
             {
                 baseUser.PendingBuddyRequestTo = userToFriend;
                 byte[] pendingMsg = PacketBuilder.CreateChat(Messages.AddBuddyPending, PacketBuilder.CHAT_BOTTOM_RIGHT);
                 byte[] pendingMsgOther = PacketBuilder.CreateChat(Messages.FormatAddBuddyPendingOther(baseUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                baseUser.LoggedinClient.SendPacket(pendingMsg);
+                baseUser.Client.SendPacket(pendingMsg);
                 if(!userToFriend.MuteBuddyRequests && !userToFriend.MuteAll)
-                    userToFriend.LoggedinClient.SendPacket(pendingMsgOther);
+                    userToFriend.Client.SendPacket(pendingMsgOther);
                 
             }
         }

HorseIsleServer/LibHISP/Player/Mailbox.cs

@@ -68,8 +68,8 @@ namespace HISP.Player
             }
 
             byte[] rippedUpMessage = PacketBuilder.CreateChat(Messages.MailRippedMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            baseUser.LoggedinClient.SendPacket(rippedUpMessage);
-            GameServer.UpdateInventory(baseUser.LoggedinClient);
+            baseUser.Client.SendPacket(rippedUpMessage);
+            GameServer.UpdateInventory(baseUser.Client);
         }
 
         public void ReadAllMail()
@@ -87,7 +87,7 @@ namespace HISP.Player
                 mails[i].Read = true;
             }
 
-            GameServer.UpdatePlayer(baseUser.LoggedinClient);
+            GameServer.UpdatePlayer(baseUser.Client);
         }
         public void AddMail(Mail mailMessage)
         {

HorseIsleServer/LibHISP/Player/Trade.cs

@@ -68,8 +68,8 @@ namespace HISP.Player
             OtherTrade.Trader.PendingTradeTo = 0;
             OtherTrade.Trader.TradingWith = null;
 
-            GameServer.UpdateArea(Trader.LoggedinClient);
-            GameServer.UpdateArea(OtherTrade.Trader.LoggedinClient);
+            GameServer.UpdateArea(Trader.Client);
+            GameServer.UpdateArea(OtherTrade.Trader.Client);
         }
 
         public bool Fail = false;
@@ -84,7 +84,7 @@ namespace HISP.Player
             if (MoneyOffered > 0 && OtherTrade.Trader.Money < 0)
             {
                 byte[] otherNegativeMoneyNotAllowed = PacketBuilder.CreateChat(Messages.TradeOtherPlayerHasNegativeMoney, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(otherNegativeMoneyNotAllowed);
+                Trader.Client.SendPacket(otherNegativeMoneyNotAllowed);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -93,7 +93,7 @@ namespace HISP.Player
             if (OtherTrade.MoneyOffered > 0 && Trader.Money < 0)
             {
                 byte[] negativeMoneyNotAllowed = PacketBuilder.CreateChat(Messages.TradeYouHaveNegativeMoney, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(negativeMoneyNotAllowed);
+                Trader.Client.SendPacket(negativeMoneyNotAllowed);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -102,7 +102,7 @@ namespace HISP.Player
             if (OtherTrade.Trader.Bids.Length > 0)
             {
                 byte[] tradeNotAllowedWhileOtherBidding = PacketBuilder.CreateChat(Messages.TradeNotAllowedWhileOtherBidding, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeNotAllowedWhileOtherBidding);
+                Trader.Client.SendPacket(tradeNotAllowedWhileOtherBidding);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -111,7 +111,7 @@ namespace HISP.Player
             if (Trader.Bids.Length > 0)
             {
                 byte[] tradeNotAllowedWhileBidding = PacketBuilder.CreateChat(Messages.TradeNotAllowedWhileBidding, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeNotAllowedWhileBidding);
+                Trader.Client.SendPacket(tradeNotAllowedWhileBidding);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -120,7 +120,7 @@ namespace HISP.Player
             if (MoneyOffered > 0 && OtherTrade.Trader.Money + MoneyOffered > 2100000000)
             {
                 byte[] tradeOtherHasTooMuchMoney = PacketBuilder.CreateChat(Messages.TradeWillGiveOtherTooMuchMoney, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeOtherHasTooMuchMoney);
+                Trader.Client.SendPacket(tradeOtherHasTooMuchMoney);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -129,7 +129,7 @@ namespace HISP.Player
             if (OtherTrade.MoneyOffered > 0 && Trader.Money + OtherTrade.MoneyOffered > 2100000000)
             {
                 byte[] tradeYouHasTooMuchMoney = PacketBuilder.CreateChat(Messages.TradeWillGiveYouTooMuchMoney, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeYouHasTooMuchMoney);
+                Trader.Client.SendPacket(tradeYouHasTooMuchMoney);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -143,7 +143,7 @@ namespace HISP.Player
             if (HorsesOffered.Length > 0 && OtherTrade.Trader.HorseInventory.HorseList.Length + HorsesOffered.Length > OtherTrade.Trader.MaxHorses)
             {
                 byte[] tradeYouHaveTooManyHorses = PacketBuilder.CreateChat(Messages.TradeYouCantHandleMoreHorses, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeYouHaveTooManyHorses);
+                Trader.Client.SendPacket(tradeYouHaveTooManyHorses);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -152,7 +152,7 @@ namespace HISP.Player
             if (OtherTrade.HorsesOffered.Length > 0 && Trader.HorseInventory.HorseList.Length + OtherTrade.HorsesOffered.Length > Trader.MaxHorses)
             {
                 byte[] tradeYouHaveTooManyHorses = PacketBuilder.CreateChat(Messages.TradeYouCantHandleMoreHorses, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeYouHaveTooManyHorses);
+                Trader.Client.SendPacket(tradeYouHaveTooManyHorses);
                 Fail = true;
                 OtherTrade.Fail = true;
             }
@@ -171,7 +171,7 @@ namespace HISP.Player
                         if (items.ItemInstances.Length + inst.Length > Item.MAX_STACK)
                         {
                             byte[] tradeTooManyItems = PacketBuilder.CreateChat(Messages.TradeYouCantCarryMoreItems, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            Trader.LoggedinClient.SendPacket(tradeTooManyItems);
+                            Trader.Client.SendPacket(tradeTooManyItems);
                             Fail = true;
                             OtherTrade.Fail = true;
                         }
@@ -189,7 +189,7 @@ namespace HISP.Player
                         if (items.ItemInstances.Length + inst.Length > Item.MAX_STACK)
                         {
                             byte[] tradeTooManyItems = PacketBuilder.CreateChat(Messages.TradeOtherCantCarryMoreItems, PacketBuilder.CHAT_BOTTOM_RIGHT);
-                            Trader.LoggedinClient.SendPacket(tradeTooManyItems);
+                            Trader.Client.SendPacket(tradeTooManyItems);
                             Fail = true;
                             OtherTrade.Fail = true;
                         }
@@ -206,7 +206,7 @@ namespace HISP.Player
             
             acceptTrade:;
             byte[] tradeAccepted = PacketBuilder.CreateChat(Messages.TradeAcceptedMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            Trader.LoggedinClient.SendPacket(tradeAccepted);
+            Trader.Client.SendPacket(tradeAccepted);
 
             // Transfer Money
 
@@ -214,14 +214,14 @@ namespace HISP.Player
             {
                 Trader.TakeMoney(MoneyOffered);
                 byte[] tradeSpentMoney = PacketBuilder.CreateChat(Messages.FormatTradeYouSpent(MoneyOffered), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeSpentMoney);
+                Trader.Client.SendPacket(tradeSpentMoney);
             }
 
             if(OtherTrade.MoneyOffered > 0)
             {
                 Trader.AddMoney(OtherTrade.MoneyOffered);
                 byte[] tradeReceivedMoney = PacketBuilder.CreateChat(Messages.FormatTradeYouReceived(OtherTrade.MoneyOffered), PacketBuilder.CHAT_BOTTOM_RIGHT);
-                Trader.LoggedinClient.SendPacket(tradeReceivedMoney);
+                Trader.Client.SendPacket(tradeReceivedMoney);
             }
 
             foreach (HorseInstance inst in HorsesOffered) // Transfer Horses
@@ -236,7 +236,7 @@ namespace HISP.Player
                         byte[] disMounted = PacketBuilder.CreateChat(Messages.TradeRiddenHorse, PacketBuilder.CHAT_BOTTOM_RIGHT);
                         Trader.Facing %= 5;
                         Trader.CurrentlyRidingHorse = null;
-                        Trader.LoggedinClient.SendPacket(disMounted);
+                        Trader.Client.SendPacket(disMounted);
                     }
                 }
 
@@ -273,13 +273,13 @@ namespace HISP.Player
         public void InteruptTrade()
         {
             byte[] tradeCanceled = PacketBuilder.CreateChat(Messages.TradeCanceledInterupted, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            Trader.LoggedinClient.SendPacket(tradeCanceled);
+            Trader.Client.SendPacket(tradeCanceled);
             endTrade();
         }
         public void AcceptTrade()
         {
             byte[] waitingForAccept = PacketBuilder.CreateChat(Messages.TradeWaitingForOthersToAcceptMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            Trader.LoggedinClient.SendPacket(waitingForAccept);
+            Trader.Client.SendPacket(waitingForAccept);
 
             if (OtherTrade.Stage == "ACCEPTED")
             {
@@ -292,18 +292,18 @@ namespace HISP.Player
         public void CancelTrade()
         {
             byte[] tradeCanceled = PacketBuilder.CreateChat(Messages.TradeCanceledByYouMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            Trader.LoggedinClient.SendPacket(tradeCanceled);
+            Trader.Client.SendPacket(tradeCanceled);
 
             byte[] tradeCanceledOther = PacketBuilder.CreateChat(Messages.FormatTradeCanceledByPlayer(Trader.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
-            OtherTrade.Trader.LoggedinClient.SendPacket(tradeCanceledOther);
+            OtherTrade.Trader.Client.SendPacket(tradeCanceledOther);
 
             endTrade();
         }
         public void CancelTradeMoved()
         {
             byte[] playerMoved = PacketBuilder.CreateChat(Messages.TradeCanceledBecuasePlayerMovedMessage, PacketBuilder.CHAT_BOTTOM_RIGHT);
-            Trader.LoggedinClient.SendPacket(playerMoved);
-            OtherTrade.Trader.LoggedinClient.SendPacket(playerMoved);
+            Trader.Client.SendPacket(playerMoved);
+            OtherTrade.Trader.Client.SendPacket(playerMoved);
 
             endTrade();
         }

HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs

@@ -30,8 +30,8 @@ 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.7.140.0")]
-[assembly: AssemblyFileVersion("1.7.140.0")]
+[assembly: AssemblyVersion("1.8.73.0")]
+[assembly: AssemblyFileVersion("1.8.73.0")]
 
 
 

HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Android</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\arm\Android\net7.0\android-arm\publish\</PublishDir>
+    <PublishDir>bin\arm\Android\net8.0\android-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>android-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Android</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\Android\net7.0\android-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\Android\net8.0\android-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>android-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>False</PublishSingleFile> !-->

HorseIsleServer/LibHISP/Properties/PublishProfiles/Linux64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\Linux\net7.0\linux-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\Linux\net8.0\linux-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\ARM\Linux\net7.0\linux-arm\publish\</PublishDir>
+    <PublishDir>bin\ARM\Linux\net8.0\linux-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Linux</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\ARM64\Linux\net7.0\linux-arm64\publish\</PublishDir>
+    <PublishDir>bin\ARM64\Linux\net8.0\linux-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/Osx64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>MacOS</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\MacOS\net7.0\osx-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\MacOS\net8.0\osx-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>MacOS</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\MacOS\net7.0\osx-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\MacOS\net8.0\osx-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>x86</Platform>
-    <PublishDir>bin\x86\Windows\net7.0\win-x86\publish\</PublishDir>
+    <PublishDir>bin\x86\Windows\net8.0\win-x86\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml

@@ -6,14 +6,14 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\x64\Windows\net7.0\win-x64\publish\</PublishDir>
+    <PublishDir>bin\x64\Windows\net8.0\win-x64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->
-    <PublishReadyToRun>True</PublishReadyToRun>
-    <PublishTrimmed>True</PublishTrimmed>
+    <!-- <PublishReadyToRun>True</PublishReadyToRun> -->
+    <!-- <PublishTrimmed>True</PublishTrimmed> -->
 	<DefineConstants>OS_WINDOWS;ARCH_X86_64</DefineConstants>
   </PropertyGroup>
 </Project>

HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\arm\Windows\net7.0\win-arm\publish\</PublishDir>
+    <PublishDir>bin\arm\Windows\net8.0\win-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Windows</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\Windows\net7.0\win-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\Windows\net8.0\win-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>iOS</Configuration>
     <Platform>ARM</Platform>
-    <PublishDir>bin\arm\iOS\net7.0\ios-arm\publish\</PublishDir>
+    <PublishDir>bin\arm\iOS\net8.0\ios-arm\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>ios-arm</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>True</PublishSingleFile> -->

HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM64.pubxml

@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>iOS</Configuration>
     <Platform>ARM64</Platform>
-    <PublishDir>bin\arm64\iOS\net7.0\ios-arm64\publish\</PublishDir>
+    <PublishDir>bin\arm64\iOS\net8.0\ios-arm64\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
     <SelfContained>True</SelfContained>
     <!-- <PublishSingleFile>False</PublishSingleFile> !-->

HorseIsleServer/LibHISP/Resources/server.properties

@@ -2,11 +2,15 @@
 # Horse Isle Server Configuration    
 # =======================
 # 
-# HISP was Created and Developed by SilicaAndPina
+# HISP was Created and Developed by Li / SilicaAndPina
 # However it is NOT COPYRIGHTED! This software is in the Public Domain!
 #
-# Ip address the server will bind to (default: 0.0.0.0 ALL INTERFACES)
 
+# =======================
+# Network               
+# =======================
+
+# 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 defaults: (on beta.horseisle.com: 12321, on pinto.horseisle.com: 443)
@@ -14,6 +18,15 @@ ip=0.0.0.0
 # running on the same port, so i prefer 12321.
 port=12321
 
+# Listen for WebSockets as well as raw Flash XMLSocket Connection
+# If this feature is enabled, players can play Horse Isle
+# on HTML5 and WebAssembly with a fork of the Ruffle Flash Player Emulator
+enable_websocket=true
+
+# =======================
+# Database               
+# =======================
+
 # MariaDB Database Information
 # For best performance, the database should be hosted on the SAME MACHINE as the HISP server.
 # Or atleast, on a local network.
@@ -26,16 +39,6 @@ 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
-
-# This folder contains all definitions in the game
-# such as items, horses. and quest data.
-# NOTE: This can be a folder or a file.
-gamedata=gamedata
-
-
 # =======================
 # Security               
 # =======================
@@ -71,6 +74,15 @@ enable_spam_filter=true
 # Misc Settings.         
 # =======================
 
+# File that contains the map tile data
+# the default was downloaded from the original server
+map=HI1.MAP
+
+# This folder contains all definitions in the game
+# such as items, horses. and quest data.
+# NOTE: This can be a folder or a file.
+gamedata=gamedata
+
 # Should the server consider all users "Subscribers"
 # (warning: makes ranches be in use forever.)
 all_users_subscribed=false

HorseIsleServer/LibHISP/Security/Authentication.cs

@@ -1,88 +1,141 @@
-
-using System.Security.Cryptography;
-using System.Text;
-using System.Linq;
-
-using HISP.Server;
-
-namespace HISP.Security
-{
-    public class Authentication
-    {
-        public static string DecryptLogin(string encpass)
-        {
-            string decrypt = "";
-            string ROTPOOL = "bl7Jgk61IZdnY mfDN5zjM2XLqTCty4WSEoKR3BFVQsaUhHOAx0rPwp9uc8iGve";
-            string POSPOOL = "DQc3uxiGsKZatMmOS5qYveN71zoPTk8yU0H2w9VjprBXWn l4FJd6IRbhgACfEL";
-            string ROTPOOL2 = "evGi8cu9pwPr0xAOHhUasQVFB3RKoESW4ytCTqLX2Mjz5NDfm YndZI16kgJ7lb";
-
-
-            int i = 0;
-            int ii = 0;
-            while (i < encpass.Length)
-            {
-                int ROT = ROTPOOL.IndexOf(encpass[i].ToString());
-                int POS = POSPOOL.IndexOf(encpass[i + 1].ToString());
-                POS -= (ROT + ii);
-                if (POS < 0)
-                {
-                    POS = (POS / -1) - 1;
-
-                    while (POS >= ROTPOOL.Length)
-                    {
-                        POS -= ROTPOOL.Length;
-                    }
-
-                    decrypt += ROTPOOL2[POS];
-                }
-                else
-                {
-                    while (POS >= ROTPOOL.Length)
-                    {
-                        POS -= ROTPOOL.Length;
-                    }
-
-                    decrypt += ROTPOOL[POS];
-                }
-
-                i += 2;
-                ii += 1;
-            }
-            return decrypt.Replace(" ", "");
-        }
-
-
-
-        public static byte[] HashAndSalt(string plaintext, byte[] salt)
-        {
-            byte[] plaintextBytes = Encoding.UTF8.GetBytes(plaintext);
-
-            SHA512 sha512 = SHA512.Create();
-            byte[] hash = sha512.ComputeHash(plaintextBytes);
-
-            for (int i = 0; i < hash.Length; i++)
-            {
-                hash[i] ^= salt[i];
-            }
-
-            byte[] finalHash = sha512.ComputeHash(hash);
-
-            return finalHash;
-        }
-
-        public static bool CheckPassword(string username, string password)
-        {
-            if(Database.CheckUserExist(username))
-            {
-                byte[] expectedPassword = Database.GetPasswordHash(username);
-                byte[] salt = Database.GetPasswordSalt(username);
-                byte[] hashedPassword = HashAndSalt(password, salt);
-
-                if (Enumerable.SequenceEqual(expectedPassword, hashedPassword))
-                    return true;
-            }
-            return false;
-        }
-
-    }
-}
+
+using System.Security.Cryptography;
+using System.Text;
+using System.Linq;
+
+using HISP.Server;
+using System;
+using HISP.Util;
+
+namespace HISP.Security
+{
+    public class Authentication
+    {
+
+        public const string ROTPOOL = "bl7Jgk61IZdnY mfDN5zjM2XLqTCty4WSEoKR3BFVQsaUhHOAx0rPwp9uc8iGve";
+        public const string POSPOOL = "DQc3uxiGsKZatMmOS5qYveN71zoPTk8yU0H2w9VjprBXWn l4FJd6IRbhgACfEL";
+
+        public static string EncryptLogin(string plainpass)
+        {
+            string encrypt = "";
+
+            int i = 0;
+            while (i < plainpass.Length)
+            {
+                int rotation = GameServer.RandomNumberGenerator.Next(0, ROTPOOL.Length);
+                int position = ROTPOOL.IndexOf(plainpass[i]);
+
+                position = position + (rotation + i);
+                while (position >= ROTPOOL.Length)
+                    position -= ROTPOOL.Length;
+                encrypt += ROTPOOL[rotation];
+                encrypt += POSPOOL[position];
+
+                i++;
+            }
+            return encrypt;
+
+        }
+        public static string DecryptLogin(string encpass)
+        {
+            string decrypt = "";
+
+            int i = 0;
+            int rotationCycle = 0;
+            while (i < encpass.Length)
+            {
+                int rotation = ROTPOOL.IndexOf(encpass[i].ToString());
+                int position = POSPOOL.IndexOf(encpass[i + 1].ToString());
+                position -= (rotation + rotationCycle);
+                if (position < 0)
+                {
+                    position = (position / -1) - 1;
+
+                    while (position >= ROTPOOL.Length)
+                        position -= ROTPOOL.Length;
+
+                    decrypt += Helper.ReverseString(ROTPOOL)[position];
+                }
+                else
+                {
+                    while (position >= ROTPOOL.Length)
+                        position -= ROTPOOL.Length;
+
+                    decrypt += ROTPOOL[position];
+                }
+
+                i += 2;
+                rotationCycle++;
+            }
+            return decrypt.Replace(" ", "");
+        }
+
+        public static byte[] Sha1Digest(byte[] message)
+        {
+            using (SHA1 sha1 = SHA1.Create())
+                return sha1.ComputeHash(message);
+        }
+
+
+        public static byte[] Sha512Digest(byte[] message)
+        {
+            using (SHA512 sha512 = SHA512.Create())
+                return sha512.ComputeHash(message);
+        }
+
+        public static byte[] XorBytes(byte[] plaintext, byte[] key)
+        {
+            int length = Math.Min(plaintext.Length, key.Length);
+
+            byte[] ciphertext = new byte[length];
+            for(int i = 0; i < length; i++)
+                ciphertext[i] = Convert.ToByte(plaintext[i] ^ key[i]);
+
+            return ciphertext;
+        }
+
+        public static byte[] HashAndSalt(string plaintext, byte[] salt)
+        {
+            byte[] plaintextBytes = Encoding.UTF8.GetBytes(plaintext);
+
+            byte[] hash = Sha512Digest(plaintextBytes);
+            byte[] saltedHash = XorBytes(hash, salt);
+            byte[] finalHash = Sha512Digest(saltedHash);
+
+            return finalHash;
+        }
+
+        public static bool CheckPassword(string username, string password)
+        {
+            if(Database.CheckUserExist(username))
+            {
+                byte[] expectedPassword = Database.GetPasswordHash(username);
+                byte[] salt = Database.GetPasswordSalt(username);
+                byte[] hashedPassword = HashAndSalt(password, salt);
+
+                if (Enumerable.SequenceEqual(expectedPassword, hashedPassword))
+                    return true;
+            }
+            return false;
+        }
+
+        public static int CreateAccount(string username, string password, string gender, bool admin, bool moderator)
+        {
+            // Get a free user id
+            int userId = Database.GetNextFreeUserId();
+
+            // Generate salt value
+            byte[] salt = new byte[64];
+            GameServer.RandomNumberGenerator.NextBytes(salt);
+            string saltText = BitConverter.ToString(salt).Replace("-", "");
+            string hashsalt = BitConverter.ToString(Authentication.HashAndSalt(password, salt)).Replace("-", "");
+
+            // Add user to database
+            Database.CreateUser(userId, username, hashsalt, saltText, gender, admin, moderator);
+
+            return userId;
+        }
+
+
+    }
+}

HorseIsleServer/LibHISP/Security/CrossDomainPolicy.cs

@@ -5,24 +5,14 @@ namespace HISP.Security
 {
     public class CrossDomainPolicy
     {
-        public static byte[] GetPolicy()
+        public static byte[] GetPolicyFile()
         {
             if (!File.Exists(ConfigReader.CrossDomainPolicyFile)) {
                 Logger.InfoPrint("Cross-Domain-Policy file not found, using default");
                 File.WriteAllText(ConfigReader.CrossDomainPolicyFile, Resources.DefaultCrossDomain);
-            } 
-                
-
-            MemoryStream ms = new MemoryStream();
+            }
             byte[] policyFileBytes = File.ReadAllBytes(ConfigReader.CrossDomainPolicyFile);
-            ms.Write(policyFileBytes, 0x00, policyFileBytes.Length);
-            ms.WriteByte(0x00);
-
-            ms.Seek(0x00, SeekOrigin.Begin);
-            byte[] policyFileData = ms.ToArray();
-            ms.Close();
-
-            return policyFileData;
+            return policyFileBytes;
         }
     }
 }

HorseIsleServer/LibHISP/Security/RandomID.cs

@@ -1,27 +1,27 @@
 using System.Threading;
 
-namespace HISP.Security
-{
-    public class RandomID
-    {
-        private static Mutex rndmIdMutex = new Mutex();
-        private static int prevId = 0;
-        public static int NextRandomId(int randomId=-1)
-        {
-            int rndmId = 0;
-            rndmIdMutex.WaitOne();
-            
-            if (randomId == -1)
-                rndmId = prevId+1;
-            else
-                rndmId = randomId;
-            
-            if (rndmId >= prevId)
+namespace HISP.Security
+{
+    public class RandomID
+    {
+        private static Mutex rndmIdMutex = new Mutex();
+        private static int prevId = 0;
+        public static int NextRandomId(int randomId=-1)
+        {
+            int rndmId = 0;
+            rndmIdMutex.WaitOne();
+            
+            if (randomId == -1)
+                rndmId = prevId+1;
+            else
+                rndmId = randomId;
+            
+            if (rndmId >= prevId)
                 prevId = rndmId;
 
-            rndmIdMutex.ReleaseMutex();
-
-            return rndmId;
-        }
-    }
-}
+            rndmIdMutex.ReleaseMutex();
+
+            return rndmId;
+        }
+    }
+}

HorseIsleServer/LibHISP/Server/ConfigReader.cs

@@ -1,141 +1,142 @@
-using HISP.Properties;
-using System.IO;
-
-namespace HISP.Server
-{
-
-    public class ConfigReader
-    {
-        public static int Port = 12321;
-        public static string BindIP = "0.0.0.0";
-
-        public static string DatabaseIP = "127.0.0.1";
-        public static string DatabaseName = "game1";
-        public static string DatabaseUsername = "root";
-        public static string DatabasePassword = "test123";
-
-        public static int DatabasePort = 3306;
-        public static int IntrestRate = 3333;
-        public static string Motd = "April 11, 2020. New breed, Camarillo White Horse. Two new quests.";
-        public static string MapFile = "HI1.MAP";
-        public static string GameData = "gamedata.json";
-        public static string CrossDomainPolicyFile = "CrossDomainPolicy.xml";
-
-        public static string ModsFolder = "mods";
-        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;
-        public static bool EnableSwearFilter = true;
-        public static bool EnableCorrections = true;
-        public static bool EnableNonViolations = true;
-
-        public static string ConfigurationFileName = "server.properties";
-        public static void OpenConfig()
-        {
-            if (!File.Exists(ConfigurationFileName))
-            {
-                Logger.WarnPrint(ConfigurationFileName+" not found! writing default.");
-                File.WriteAllText(ConfigurationFileName, Resources.DefaultServerProperties);
-                Logger.WarnPrint("! Its very likely database connection will fail...");
-            }
-
-            string[] configFile = File.ReadAllLines(ConfigurationFileName);
-            foreach (string setting in configFile)
-            {
-                /*
-                 * Avoid crashing.
-                 */
-                if (setting.Length < 1)
-                    continue;
-                if (setting[0] == '#')
-                    continue;
-                if (!setting.Contains("="))
-                    continue;
-
-                string[] dataPair = setting.Split('=');
-
-                string key = dataPair[0];
-                string data = dataPair[1];
-                /*
-                 *  Parse configuration file
-                 */
-
-                switch (key)
-                {
-                    case "port":
-                        Port = int.Parse(data);
-                        break;
-                    case "ip":
-                        BindIP = data;
-                        break;
-                    case "db_ip":
-                        DatabaseIP = data;
-                        break;
-                    case "db_username":
-                        DatabaseUsername = data;
-                        break;
-                    case "db_password":
-                        DatabasePassword = data;
-                        break;
-                    case "db_name":
-                        DatabaseName = data;
-                        break;
-                    case "db_port":
-                        DatabasePort = int.Parse(data);
-                        break;
-                    case "map":
-                        MapFile = data;
-                        break;
-                    case "motd":
-                        Motd = data;
-                        break;
-                    case "gamedata":
-                        GameData = data;
-                        break;
-                    case "crossdomain":
-                        CrossDomainPolicyFile = data;
-                        break;
-                    case "all_users_subscribed":
-                        AllUsersSubbed = data == "true";
-                        break;
-                    case "enable_corrections":
-                        EnableCorrections = data == "true";
-                        break;
-                    case "sql_lite":
-                        SqlLite = data == "true";
-                        break;
-                    case "enable_non_violation_check":
-                        EnableNonViolations = data == "true";
-                        break;
-                    case "enable_spam_filter":
-                        EnableSpamFilter = data == "true";
-                        break;
-                    case "fix_offical_bugs":
-                        FixOfficalBugs = data == "true";
-                        break;
-                    case "enable_word_filter":
-                        EnableSwearFilter = data == "true";
+using HISP.Properties;
+using System.IO;
+
+namespace HISP.Server
+{
+
+    public class ConfigReader
+    {
+        public static int Port = 12321;
+        public static string BindIP = "0.0.0.0";
+
+        public static string DatabaseIP = "127.0.0.1";
+        public static string DatabaseName = "game1";
+        public static string DatabaseUsername = "root";
+        public static string DatabasePassword = "test123";
+
+        public static int DatabasePort = 3306;
+        public static int IntrestRate = 3333;
+        public static string Motd = "April 11, 2020. New breed, Camarillo White Horse. Two new quests.";
+        public static string MapFile = "HI1.MAP";
+        public static string GameData = "gamedata.json";
+        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;
+        public static bool EnableSwearFilter = true;
+        public static bool EnableCorrections = true;
+        public static bool EnableNonViolations = true;
+
+        public static bool EnableWebSocket = true;
+
+        public static string ConfigurationFileName = "server.properties";
+        public static void OpenConfig()
+        {
+            if (!File.Exists(ConfigurationFileName))
+            {
+                Logger.WarnPrint(ConfigurationFileName+" not found! writing default.");
+                File.WriteAllText(ConfigurationFileName, Resources.DefaultServerProperties);
+                Logger.WarnPrint("! Its very likely database connection will fail...");
+            }
+
+            string[] configFile = File.ReadAllLines(ConfigurationFileName);
+            foreach (string setting in configFile)
+            {
+                /*
+                 * Avoid crashing.
+                 */
+                if (setting.Length < 1)
+                    continue;
+                if (setting[0] == '#')
+                    continue;
+                if (!setting.Contains("="))
+                    continue;
+
+                string[] dataPair = setting.Split('=');
+
+                string key = dataPair[0];
+                string data = dataPair[1];
+                /*
+                 *  Parse configuration file
+                 */
+
+                switch (key)
+                {
+                    case "port":
+                        Port = int.Parse(data);
                         break;
-                    case "mods_folder":
-                        ModsFolder = data;
-                        break;
-                    case "intrest_rate":
-                        IntrestRate = int.Parse(data);
-                        break;
-                    case "log_level":
-                        LogLevel = int.Parse(data);
-                        break;
-                }
-
-
-
-            }
-
-
-        }
-
-    }
-}
+                    case "ip":
+                        BindIP = data;
+                        break;
+                    case "db_ip":
+                        DatabaseIP = data;
+                        break;
+                    case "db_username":
+                        DatabaseUsername = data;
+                        break;
+                    case "db_password":
+                        DatabasePassword = data;
+                        break;
+                    case "db_name":
+                        DatabaseName = data;
+                        break;
+                    case "db_port":
+                        DatabasePort = int.Parse(data);
+                        break;
+                    case "map":
+                        MapFile = data;
+                        break;
+                    case "motd":
+                        Motd = data;
+                        break;
+                    case "gamedata":
+                        GameData = data;
+                        break;
+                    case "crossdomain":
+                        CrossDomainPolicyFile = data;
+                        break;
+                    case "all_users_subscribed":
+                        AllUsersSubbed = (data == "true");
+                        break;
+                    case "enable_corrections":
+                        EnableCorrections = (data == "true");
+                        break;
+                    case "sql_lite":
+                        SqlLite = (data == "true");
+                        break;
+                    case "enable_non_violation_check":
+                        EnableNonViolations = (data == "true");
+                        break;
+                    case "enable_spam_filter":
+                        EnableSpamFilter = (data == "true");
+                        break;
+                    case "enable_websocket":
+                        EnableWebSocket = (data == "true");
+                        break;
+                    case "fix_offical_bugs":
+                        FixOfficalBugs = (data == "true");
+                        break;
+                    case "enable_word_filter":
+                        EnableSwearFilter = (data == "true");
+                        break;
+                    case "intrest_rate":
+                        IntrestRate = int.Parse(data);
+                        break;
+                    case "log_level":
+                        LogLevel = int.Parse(data);
+                        break;
+                }
+
+
+
+            }
+
+
+        }
+
+    }
+}

HorseIsleServer/LibHISP/Server/DataFixerUpper.cs

@@ -39,7 +39,6 @@ namespace HISP.Server
             Database.TryExecuteSqlQuery("UPDATE World SET LastLoadedInVersion=\"v1.7.20\";");
         }
 
-
         public static void FixUpDb()
         {
             string lastVersionStr = Database.GetLastLoadedVersion();

HorseIsleServer/LibHISP/Server/Database.cs

@@ -3545,8 +3545,6 @@ namespace HISP.Server
             }
         }
 
-
-
         public static void SetJewelrySlot1(int playerId, int itemId)
         {
             using (DbConnection db = connectDb())
@@ -4128,7 +4126,41 @@ namespace HISP.Server
                 return subscribedUntil;
             }
         }
-        public static bool IsUserAdmin(int playerId)
+
+        public static void SetUserSubscriptionStatus(int playerId, int subscribedUntil)
+        {
+            using (DbConnection db = connectDb())
+            {
+                db.Open();
+                DbCommand sqlCommand = db.CreateCommand();
+
+                sqlCommand.CommandText = "UPDATE UserExt SET SubscribedUntil=@subscribedUntil WHERE Id=@playerId";
+                addWithValue(sqlCommand, "@subscribedUntil", subscribedUntil);
+                addWithValue(sqlCommand, "@playerId", playerId);
+                sqlCommand.Prepare();
+                sqlCommand.ExecuteNonQuery();
+
+            }
+        }
+
+
+        public static bool GetUserModerator(int playerId)
+        {
+            using (DbConnection db = connectDb())
+            {
+                db.Open();
+                DbCommand sqlCommand = db.CreateCommand();
+
+                sqlCommand.CommandText = "SELECT Moderator FROM Users WHERE Id=@playerId";
+                addWithValue(sqlCommand, "@playerId", playerId);
+                sqlCommand.Prepare();
+                bool admin = sqlCommand.ExecuteScalar().ToString() == "YES";
+
+
+                return admin;
+            }
+        }
+        public static bool GetUserAdmin(int playerId)
         {
             using (DbConnection db = connectDb())
             {
@@ -4144,7 +4176,7 @@ namespace HISP.Server
                 return admin;
             }
         }
-        public static bool IsUserSubscribed(int playerId)
+        public static bool GetUserSubscribed(int playerId)
         {
             if (ConfigReader.AllUsersSubbed)
                 return true;
@@ -4439,6 +4471,38 @@ namespace HISP.Server
                 
             }
         }
+        public static void SetUserMod(int playerId, bool moderator)
+        {
+            using (DbConnection db = connectDb())
+            {
+                db.Open();
+                DbCommand sqlCommand = db.CreateCommand();
+                string yesno = (moderator ? "YES" : "NO");
+
+                sqlCommand.CommandText = "UPDATE Users SET Moderator=@moderator WHERE Id=@playerId";
+                addWithValue(sqlCommand, "@playerId", playerId);
+                addWithValue(sqlCommand, "@moderator", yesno);
+                sqlCommand.Prepare();
+                sqlCommand.ExecuteNonQuery();
+            }
+        }
+
+        public static void SetUserAdmin(int playerId, bool admin)
+        {
+            using (DbConnection db = connectDb())
+            {
+                db.Open();
+                DbCommand sqlCommand = db.CreateCommand();
+                string yesno = (admin ? "YES" : "NO");
+
+                sqlCommand.CommandText = "UPDATE Users SET Admin=@admin WHERE Id=@playerId";
+                addWithValue(sqlCommand, "@playerId", playerId);
+                addWithValue(sqlCommand, "@admin", yesno);
+                sqlCommand.Prepare();
+                sqlCommand.ExecuteNonQuery();
+            }
+        }
+
         public static void SetNpcX(int npcId, int x)
         {
             using (DbConnection db = connectDb())
@@ -4837,7 +4901,7 @@ namespace HISP.Server
         }
 
 
-        public static bool CheckUserIsModerator(string username)
+        public static bool CheckUsernameIsModerator(string username)
         {
             using (DbConnection db = connectDb())
             {
@@ -4861,7 +4925,7 @@ namespace HISP.Server
         }
 
 
-        public static bool CheckUserIsAdmin(string username)
+        public static bool CheckUsernameIsAdmin(string username)
         {
             using (DbConnection db = connectDb())
             {