diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml old mode 100644 new mode 100755 index 130e5b2..e997e37 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,10 @@ jobs: cd HISPd dotnet publish -p:PublishProfile=Linux64.pubxml cd .. + cd MPN00BS + dotnet publish -p:PublishProfile=Linux64.pubxml + cd .. + # Currently broken ... # dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease @@ -149,6 +153,12 @@ jobs: name: HISP-Linux64 path: HorseIsleServer/HISPd/bin/x64/Linux/net7.0/linux-x64/publish/ + - name: Upload linux-x64-noobs + uses: actions/upload-artifact@v2 + with: + name: HISP-Linux64-Noobs + path: HorseIsleServer/MPN00BS/bin/x64/Linux/net7.0/linux-x64/publish/ + - name: Upload linux-arm uses: actions/upload-artifact@v2 with: @@ -355,4 +365,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: HISP-Web-Game - path: HorseIsleWeb/game-site \ No newline at end of file + path: HorseIsleWeb/game-site diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 diff --git a/.mailmap b/.mailmap old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISP.sln b/HorseIsleServer/HISP.sln old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/HISPd.csproj b/HorseIsleServer/HISPd/HISPd.csproj old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Program.cs b/HorseIsleServer/HISPd/Program.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/Linux64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/LinuxARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/LinuxARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/Osx64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/OsxARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/Win32.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/WinARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/WinARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/Resources.Designer.cs b/HorseIsleServer/HISPd/Properties/Resources.Designer.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/Resources.resx b/HorseIsleServer/HISPd/Properties/Resources.resx old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Properties/launchSettings.json b/HorseIsleServer/HISPd/Properties/launchSettings.json old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/conffiles b/HorseIsleServer/HISPd/Resources/DEBIAN/conffiles old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control old mode 100644 new mode 100755 index b5c8e77..a0cf3bb --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.7.110 +Version: 1.7.112 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/copyright b/HorseIsleServer/HISPd/Resources/DEBIAN/copyright old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/postinst b/HorseIsleServer/HISPd/Resources/DEBIAN/postinst old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/postrm b/HorseIsleServer/HISPd/Resources/DEBIAN/postrm old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/prerm b/HorseIsleServer/HISPd/Resources/DEBIAN/prerm old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/Resources/HISP.service b/HorseIsleServer/HISPd/Resources/HISP.service old mode 100644 new mode 100755 diff --git a/HorseIsleServer/HISPd/icon.ico b/HorseIsleServer/HISPd/icon.ico old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/AbuseReport.cs b/HorseIsleServer/LibHISP/Game/AbuseReport.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Arena.cs b/HorseIsleServer/LibHISP/Game/Arena.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Book.cs b/HorseIsleServer/LibHISP/Game/Book.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Chat/Chat.cs b/HorseIsleServer/LibHISP/Game/Chat/Chat.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Chat/Command.cs b/HorseIsleServer/LibHISP/Game/Chat/Command.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Chat/CommandRegister.cs b/HorseIsleServer/LibHISP/Game/Chat/CommandRegister.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Chat/SocialType.cs b/HorseIsleServer/LibHISP/Game/Chat/SocialType.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Events/IsleCardTradingGame.cs b/HorseIsleServer/LibHISP/Game/Events/IsleCardTradingGame.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Events/ModsRevenge.cs b/HorseIsleServer/LibHISP/Game/Events/ModsRevenge.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Events/RandomEvent.cs b/HorseIsleServer/LibHISP/Game/Events/RandomEvent.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Events/RealTimeQuiz.cs b/HorseIsleServer/LibHISP/Game/Events/RealTimeQuiz.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Events/RealTimeRiddle.cs b/HorseIsleServer/LibHISP/Game/Events/RealTimeRiddle.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Events/TackShopGiveaway.cs b/HorseIsleServer/LibHISP/Game/Events/TackShopGiveaway.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Events/WaterBalloonGame.cs b/HorseIsleServer/LibHISP/Game/Events/WaterBalloonGame.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/GameExceptions.cs b/HorseIsleServer/LibHISP/Game/GameExceptions.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Horse/HorseInfo.cs b/HorseIsleServer/LibHISP/Game/Horse/HorseInfo.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Horse/HorseInstance.cs b/HorseIsleServer/LibHISP/Game/Horse/HorseInstance.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Horse/Leaser.cs b/HorseIsleServer/LibHISP/Game/Horse/Leaser.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Horse/WildHorse.cs b/HorseIsleServer/LibHISP/Game/Horse/WildHorse.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Inventory/HorseInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/HorseInventory.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Inventory/IInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/IInventory.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Inventory/InventoryItem.cs b/HorseIsleServer/LibHISP/Game/Inventory/InventoryItem.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Inventory/PlayerInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/PlayerInventory.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Inventory/ShopInventory.cs b/HorseIsleServer/LibHISP/Game/Inventory/ShopInventory.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Items/DroppedItems.cs b/HorseIsleServer/LibHISP/Game/Items/DroppedItems.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Items/Item.cs b/HorseIsleServer/LibHISP/Game/Items/Item.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Items/ItemInstance.cs b/HorseIsleServer/LibHISP/Game/Items/ItemInstance.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Items/Tack.cs b/HorseIsleServer/LibHISP/Game/Items/Tack.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Map.cs b/HorseIsleServer/LibHISP/Game/Map.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Messages.cs b/HorseIsleServer/LibHISP/Game/Messages.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Meta.cs b/HorseIsleServer/LibHISP/Game/Meta.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Multiroom.cs b/HorseIsleServer/LibHISP/Game/Multiroom.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Npc.cs b/HorseIsleServer/LibHISP/Game/Npc.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Quest.cs b/HorseIsleServer/LibHISP/Game/Quest.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Ranch.cs b/HorseIsleServer/LibHISP/Game/Ranch.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Riddler.cs b/HorseIsleServer/LibHISP/Game/Riddler.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Auction.cs b/HorseIsleServer/LibHISP/Game/Services/Auction.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Barn.cs b/HorseIsleServer/LibHISP/Game/Services/Barn.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Farrier.cs b/HorseIsleServer/LibHISP/Game/Services/Farrier.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Groomer.cs b/HorseIsleServer/LibHISP/Game/Services/Groomer.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Inn.cs b/HorseIsleServer/LibHISP/Game/Services/Inn.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Pawneer.cs b/HorseIsleServer/LibHISP/Game/Services/Pawneer.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Shop.cs b/HorseIsleServer/LibHISP/Game/Services/Shop.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Trainer.cs b/HorseIsleServer/LibHISP/Game/Services/Trainer.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Transport.cs b/HorseIsleServer/LibHISP/Game/Services/Transport.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Vet.cs b/HorseIsleServer/LibHISP/Game/Services/Vet.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Services/Workshop.cs b/HorseIsleServer/LibHISP/Game/Services/Workshop.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs b/HorseIsleServer/LibHISP/Game/SwfModules/Brickpoet.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/SwfModules/Drawingroom.cs b/HorseIsleServer/LibHISP/Game/SwfModules/Drawingroom.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/SwfModules/Dressup.cs b/HorseIsleServer/LibHISP/Game/SwfModules/Dressup.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Tracking.cs b/HorseIsleServer/LibHISP/Game/Tracking.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/Treasure.cs b/HorseIsleServer/LibHISP/Game/Treasure.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/TwoPlayer.cs b/HorseIsleServer/LibHISP/Game/TwoPlayer.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Game/World.cs b/HorseIsleServer/LibHISP/Game/World.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Award.cs b/HorseIsleServer/LibHISP/Player/Award.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Dance.cs b/HorseIsleServer/LibHISP/Player/Dance.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Equips/CompetitionGear.cs b/HorseIsleServer/LibHISP/Player/Equips/CompetitionGear.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Equips/Jewelry.cs b/HorseIsleServer/LibHISP/Player/Equips/Jewelry.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Friends.cs b/HorseIsleServer/LibHISP/Player/Friends.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Highscore.cs b/HorseIsleServer/LibHISP/Player/Highscore.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Mailbox.cs b/HorseIsleServer/LibHISP/Player/Mailbox.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/MutedPlayers.cs b/HorseIsleServer/LibHISP/Player/MutedPlayers.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/PlayerQuests.cs b/HorseIsleServer/LibHISP/Player/PlayerQuests.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/TrackedQuest.cs b/HorseIsleServer/LibHISP/Player/TrackedQuest.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/Trade.cs b/HorseIsleServer/LibHISP/Player/Trade.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Player/User.cs b/HorseIsleServer/LibHISP/Player/User.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs old mode 100644 new mode 100755 index a8330b7..6007f7d --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,5 +30,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.7.110.0")] -[assembly: AssemblyFileVersion("1.7.110.0")] +[assembly: AssemblyVersion("1.7.112.0")] +[assembly: AssemblyFileVersion("1.7.112.0")] diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/AndroidARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Linux64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/LinuxARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Osx64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/OsxARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win32.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/Win64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/WinARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs b/HorseIsleServer/LibHISP/Properties/Resources.Designer.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/Resources.resx b/HorseIsleServer/LibHISP/Properties/Resources.resx old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Properties/launchSettings.json b/HorseIsleServer/LibHISP/Properties/launchSettings.json old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Resources/default_cross_domain.xml b/HorseIsleServer/LibHISP/Resources/default_cross_domain.xml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Resources/server.properties b/HorseIsleServer/LibHISP/Resources/server.properties old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Security/Authentication.cs b/HorseIsleServer/LibHISP/Security/Authentication.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Security/BBCode.cs b/HorseIsleServer/LibHISP/Security/BBCode.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Security/CrossDomainPolicy.cs b/HorseIsleServer/LibHISP/Security/CrossDomainPolicy.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Security/RandomID.cs b/HorseIsleServer/LibHISP/Security/RandomID.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/ConfigReader.cs b/HorseIsleServer/LibHISP/Server/ConfigReader.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/DataFixerUpper.cs b/HorseIsleServer/LibHISP/Server/DataFixerUpper.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/Database.cs b/HorseIsleServer/LibHISP/Server/Database.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/Entry.cs b/HorseIsleServer/LibHISP/Server/Entry.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/GameClient.cs b/HorseIsleServer/LibHISP/Server/GameClient.cs old mode 100644 new mode 100755 index 2e6c273..0e8176e --- a/HorseIsleServer/LibHISP/Server/GameClient.cs +++ b/HorseIsleServer/LibHISP/Server/GameClient.cs @@ -113,13 +113,18 @@ namespace HISP.Server } public static void CreateClient(object sender, SocketAsyncEventArgs e) { - do - { - Socket eSocket = e.AcceptSocket; - if(eSocket != null) - new GameClient(eSocket); - e.AcceptSocket = null; - } while (!GameServer.ServerSocket.AcceptAsync(e)); + try{ + do + { + Socket eSocket = e.AcceptSocket; + if(eSocket != null) + new GameClient(eSocket); + e.AcceptSocket = null; + + if(GameServer.ServerSocket == null) + return; + } while (!GameServer.ServerSocket.AcceptAsync(e)); + }catch(ObjectDisposedException) {} // server shutdown } private void timeoutTimerTick(object state) { diff --git a/HorseIsleServer/LibHISP/Server/GameDataJson.cs b/HorseIsleServer/LibHISP/Server/GameDataJson.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/GameServer.cs b/HorseIsleServer/LibHISP/Server/GameServer.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/Logger.cs b/HorseIsleServer/LibHISP/Server/Logger.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/PacketBuilder.cs b/HorseIsleServer/LibHISP/Server/PacketBuilder.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/LibHISP/Server/ServerVersion.cs b/HorseIsleServer/LibHISP/Server/ServerVersion.cs old mode 100644 new mode 100755 index 774f37f..5efadbe --- a/HorseIsleServer/LibHISP/Server/ServerVersion.cs +++ b/HorseIsleServer/LibHISP/Server/ServerVersion.cs @@ -1,78 +1,78 @@ using System; using System.Globalization; using HISP.Properties; - -namespace HISP.Server -{ - public class ServerVersion - { - - public static string PRODUCT = "HISP"; - - public static string GetArchitecture() - { -#if ARCH_ANYCPU - return "ANYCPU"; -#elif ARCH_X86_64 - return "x86_64"; -#elif ARCH_X86 - return "x86"; -#elif ARCH_ARM - return "ARM"; -#elif ARCH_ARM64 - return "ARM64"; -#else - return "UNK_ARCH"; -#endif - } - public static string GetPlatform() - { -#if OS_DEBUG - return "DEBUG"; -#elif OS_WINDOWS - return "WINDOWS"; -#elif OS_ANDROID - return "ANDROID"; -#elif OS_IOS - return "IOS"; -#elif OS_LINUX - return "LINUX"; -#elif OS_MACOS - return "MACOS"; -#else - return "UNK_PLATFORM"; -#endif - - } - public static string GetVersionString() - { - return Resources.GitTag.Replace("\r", "").Replace("\n", "").ToString().Trim(); - } - public static string GetBranch() - { - return Resources.GitBranch.Replace("\r", "").Replace("\n", "").ToString().Trim(); - } - public static string GetBuildDate() - { - return Resources.BuildDate.Replace("\r", "").Replace("\n", "").ToString().Trim(); - } - public static string GetBuildTime() - { - return Resources.BuildTime.Replace("\r", "").Replace("\n", "").ToString().Trim(); - } - + +namespace HISP.Server +{ + public class ServerVersion + { + + public static string PRODUCT = "HISP"; + + public static string GetArchitecture() + { +#if ARCH_ANYCPU + return "ANYCPU"; +#elif ARCH_X86_64 + return "x86_64"; +#elif ARCH_X86 + return "x86"; +#elif ARCH_ARM + return "ARM"; +#elif ARCH_ARM64 + return "ARM64"; +#else + return "UNK_ARCH"; +#endif + } + public static string GetPlatform() + { +#if OS_DEBUG + return "DEBUG"; +#elif OS_WINDOWS + return "WINDOWS"; +#elif OS_ANDROID + return "ANDROID"; +#elif OS_IOS + return "IOS"; +#elif OS_LINUX + return "LINUX"; +#elif OS_MACOS + return "MACOS"; +#else + return "UNK_PLATFORM"; +#endif + + } + public static string GetVersionString() + { + return Resources.GitTag.Replace("\r", "").Replace("\n", "").ToString().Trim(); + } + public static string GetBranch() + { + return Resources.GitBranch.Replace("\r", "").Replace("\n", "").ToString().Trim(); + } + public static string GetBuildDate() + { + return Resources.BuildDate.Replace("\r", "").Replace("\n", "").ToString().Trim(); + } + public static string GetBuildTime() + { + return Resources.BuildTime.Replace("\r", "").Replace("\n", "").ToString().Trim(); + } + public static string GetCommitHashVersion() { return UInt16.Parse(Resources.GitCommit.Substring(0, 4), NumberStyles.HexNumber).ToString(); - } - - public static string GetCommitHash(int TotalBytes) - { - return Resources.GitCommit.Substring(0, TotalBytes).Replace("\r", "").Replace("\n", "").ToString().Trim(); - } - public static string GetBuildString() - { - return PRODUCT + " " + GetVersionString() + " " + GetBranch() + "@" + GetCommitHash(6) + " (" + GetArchitecture() + "; " + GetPlatform() + "); Built @ " + GetBuildDate() + " " + GetBuildTime(); - } - } -} + } + + public static string GetCommitHash(int TotalBytes) + { + return Resources.GitCommit.Substring(0, TotalBytes).Replace("\r", "").Replace("\n", "").ToString().Trim(); + } + public static string GetBuildString() + { + return PRODUCT + " " + GetVersionString() + " " + GetBranch() + "@" + GetCommitHash(6) + " (" + GetArchitecture() + "; " + GetPlatform() + "); Built @ " + GetBuildDate() + " " + GetBuildTime(); + } + } +} diff --git a/HorseIsleServer/LibHISP/Server/Util.cs b/HorseIsleServer/LibHISP/Server/Util.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/App.axaml b/HorseIsleServer/MPN00BS/App.axaml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/App.axaml.cs b/HorseIsleServer/MPN00BS/App.axaml.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/CrossDomainPolicy.xml b/HorseIsleServer/MPN00BS/CrossDomainPolicy.xml new file mode 100755 index 0000000..b9c7e79 --- /dev/null +++ b/HorseIsleServer/MPN00BS/CrossDomainPolicy.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/HorseIsleServer/MPN00BS/HTTP/ContentServer.cs b/HorseIsleServer/MPN00BS/HTTP/ContentServer.cs old mode 100644 new mode 100755 index 5640781..bf9a6e4 --- a/HorseIsleServer/MPN00BS/HTTP/ContentServer.cs +++ b/HorseIsleServer/MPN00BS/HTTP/ContentServer.cs @@ -34,7 +34,6 @@ namespace HTTP { clientSock = ClientSocket; baseServ = Server; - baseServ.WriteDebugOutput("Client Connected @ " + clientSock.RemoteEndPoint.ToString()); ProcessRequests(); clientSock.Close(); @@ -107,7 +106,6 @@ namespace HTTP private void RespondGet(string name) { - baseServ.WriteDebugOutput("GET " + name); if (ContentItemExists(name)) { @@ -156,7 +154,6 @@ namespace HTTP private void RespondHead(string path) { string name = Path.GetFileName(path); - baseServ.WriteDebugOutput("HEAD " + path); if (ContentItemExists(name)) { @@ -262,26 +259,37 @@ namespace HTTP { public List Contents = new List(); public Socket ServerSocket; - public void WriteDebugOutput(string txt) - { - Console.WriteLine("[HTTP] " + txt); - } + public void CreateClient(object sender, SocketAsyncEventArgs e) { do { + if(shutdownServer) + return; + Socket eSocket = e.AcceptSocket; if (eSocket != null) new ContentClient(this, eSocket); e.AcceptSocket = null; } while (!ServerSocket.AcceptAsync(e)); } - public ContentServer(string ip) + + public void Shutdown() { + shutdownServer = true; + ServerSocket.Dispose(); + ServerSocket = null; + } + private bool shutdownServer = false; + public string ipaddr; + public short portnum; + + public ContentServer(string ip, short port) { - - WriteDebugOutput("Listening for connections on port 80."); - IPEndPoint ep = new IPEndPoint(IPAddress.Parse(ip), 80); + ipaddr = ip; + portnum = port; + + IPEndPoint ep = new IPEndPoint(IPAddress.Parse(ip), port); ServerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); ServerSocket.Bind(ep); ServerSocket.Listen(0x7fffffff); diff --git a/HorseIsleServer/MPN00BS/HispLogo.gif b/HorseIsleServer/MPN00BS/HispLogo.gif old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/HispViewModel.cs b/HorseIsleServer/MPN00BS/HispViewModel.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/LoadingWindow.axaml b/HorseIsleServer/MPN00BS/LoadingWindow.axaml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/LoadingWindow.axaml.cs b/HorseIsleServer/MPN00BS/LoadingWindow.axaml.cs old mode 100644 new mode 100755 index f1e855e..08a2bcb --- a/HorseIsleServer/MPN00BS/LoadingWindow.axaml.cs +++ b/HorseIsleServer/MPN00BS/LoadingWindow.axaml.cs @@ -38,6 +38,7 @@ namespace MPN00BS Dispatcher.UIThread.InvokeAsync(() => { ServerStarter.CloseHorseIsleClient(); + ServerStarter.ShutdownHTTPServer(); this.Close(); }); } @@ -52,9 +53,6 @@ namespace MPN00BS public LoadingWindow() { InitializeComponent(); -#if DEBUG - this.AttachDevTools(); -#endif ServerStarter.StartHttpServer(); new Task( () => ServerStarter.StartHispServer(ProgressUpdate, OnNoUsersFound, OnServerStarted, OnShutdown)).Start(); } diff --git a/HorseIsleServer/MPN00BS/MPN00BS.csproj b/HorseIsleServer/MPN00BS/MPN00BS.csproj old mode 100644 new mode 100755 index 4179117..139a513 --- a/HorseIsleServer/MPN00BS/MPN00BS.csproj +++ b/HorseIsleServer/MPN00BS/MPN00BS.csproj @@ -98,7 +98,12 @@ OS_LINUX;ARCH_ARM64 none - + + true + OS_LINUX;ARCH_ANYCPU + none + + osx-x64 true @@ -218,8 +223,6 @@ - - @@ -228,8 +231,17 @@ - + PreserveNewest - + flashplayer/LINUX/flash.elf + + + + + PreserveNewest + flashplayer\WINDOWS\flash.exe + + + diff --git a/HorseIsleServer/MPN00BS/MPN00BS.csproj.user b/HorseIsleServer/MPN00BS/MPN00BS.csproj.user deleted file mode 100644 index a17a1bb..0000000 --- a/HorseIsleServer/MPN00BS/MPN00BS.csproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - <_LastSelectedProfileId>C:\Users\Li\Documents\git\HISP\HorseIsleServer\MPN00BS\Properties\PublishProfiles\Win64.pubxml - - \ No newline at end of file diff --git a/HorseIsleServer/MPN00BS/MessageBox.axaml b/HorseIsleServer/MPN00BS/MessageBox.axaml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/MessageBox.axaml.cs b/HorseIsleServer/MPN00BS/MessageBox.axaml.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/MiniMvvm/MiniCommand.cs b/HorseIsleServer/MPN00BS/MiniMvvm/MiniCommand.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/MiniMvvm/PropertyChangedExtensions.cs b/HorseIsleServer/MPN00BS/MiniMvvm/PropertyChangedExtensions.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/MiniMvvm/ViewModelBase.cs b/HorseIsleServer/MPN00BS/MiniMvvm/ViewModelBase.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/MpOrSp.axaml b/HorseIsleServer/MPN00BS/MpOrSp.axaml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/MpOrSp.axaml.cs b/HorseIsleServer/MPN00BS/MpOrSp.axaml.cs old mode 100644 new mode 100755 index 2ea047d..3d0fd4d --- a/HorseIsleServer/MPN00BS/MpOrSp.axaml.cs +++ b/HorseIsleServer/MPN00BS/MpOrSp.axaml.cs @@ -9,9 +9,6 @@ namespace MPN00BS public MpOrSp() { InitializeComponent(); -#if DEBUG - this.AttachDevTools(); -#endif } private void playSingleplayerClick(object sender, RoutedEventArgs e) { diff --git a/HorseIsleServer/MPN00BS/Program.cs b/HorseIsleServer/MPN00BS/Program.cs old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs old mode 100644 new mode 100755 index 08f2436..84fdb1d --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,5 +30,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.7.110.0")] -[assembly: AssemblyFileVersion("1.7.110.0")] +[assembly: AssemblyVersion("1.7.112.0")] +[assembly: AssemblyFileVersion("1.7.112.0")] diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/AndroidARM.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/AndroidARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/AndroidARM64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/AndroidARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Linux64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/LinuxARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/LinuxARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Osx64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/OsxARM64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/OsxARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win32.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml.user b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/Win64.pubxml.user old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/WinARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/WinARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/iOSARM.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/iOSARM.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/Properties/PublishProfiles/iOSARM64.pubxml b/HorseIsleServer/MPN00BS/Properties/PublishProfiles/iOSARM64.pubxml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/RegisterWindow.axaml b/HorseIsleServer/MPN00BS/RegisterWindow.axaml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/RegisterWindow.axaml.cs b/HorseIsleServer/MPN00BS/RegisterWindow.axaml.cs old mode 100644 new mode 100755 index a1752a0..31ffd04 --- a/HorseIsleServer/MPN00BS/RegisterWindow.axaml.cs +++ b/HorseIsleServer/MPN00BS/RegisterWindow.axaml.cs @@ -15,9 +15,6 @@ namespace MPN00BS public RegisterWindow() { InitializeComponent(); -#if DEBUG - this.AttachDevTools(); -#endif } diff --git a/HorseIsleServer/MPN00BS/ResetWindow.axaml b/HorseIsleServer/MPN00BS/ResetWindow.axaml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/ResetWindow.axaml.cs b/HorseIsleServer/MPN00BS/ResetWindow.axaml.cs old mode 100644 new mode 100755 index fd52d10..0ffeb6c --- a/HorseIsleServer/MPN00BS/ResetWindow.axaml.cs +++ b/HorseIsleServer/MPN00BS/ResetWindow.axaml.cs @@ -14,9 +14,6 @@ namespace MPN00BS public ResetWindow() { InitializeComponent(); -#if DEBUG - this.AttachDevTools(); -#endif } private void ValidateInput() diff --git a/HorseIsleServer/MPN00BS/ServerSelection.axaml b/HorseIsleServer/MPN00BS/ServerSelection.axaml old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/ServerSelection.axaml.cs b/HorseIsleServer/MPN00BS/ServerSelection.axaml.cs old mode 100644 new mode 100755 index 6b571ca..58df6e1 --- a/HorseIsleServer/MPN00BS/ServerSelection.axaml.cs +++ b/HorseIsleServer/MPN00BS/ServerSelection.axaml.cs @@ -2,6 +2,8 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; +using Avalonia.Threading; + using System; namespace MPN00BS @@ -11,9 +13,6 @@ namespace MPN00BS public ServerSelection() { InitializeComponent(); -#if DEBUG - this.AttachDevTools(); -#endif } private void InitializeComponent() @@ -31,7 +30,11 @@ namespace MPN00BS private void OnClientExit() { - this.Close(); + Dispatcher.UIThread.InvokeAsync(() => + { + ServerStarter.ShutdownHTTPServer(); + this.Close(); + }); } } } diff --git a/HorseIsleServer/MPN00BS/ServerStarter.cs b/HorseIsleServer/MPN00BS/ServerStarter.cs old mode 100644 new mode 100755 index 14ab970..b66aaf4 --- a/HorseIsleServer/MPN00BS/ServerStarter.cs +++ b/HorseIsleServer/MPN00BS/ServerStarter.cs @@ -31,7 +31,9 @@ namespace MPN00BS cs.Contents.Add(ci); } - + public static void ShutdownHTTPServer(){ + cs.Shutdown(); + } public static void ShowCrash(bool error, string type, string text) { @@ -56,9 +58,20 @@ namespace MPN00BS HorseIsleClientExitCallback = callback; clientProcess = new Process(); +#if OS_WINDOWS clientProcess.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "WINDOWS", "flash.exe"); - clientProcess.StartInfo.Arguments = "http://127.0.0.1/horseisle.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); - +#elif OS_LINUX + clientProcess.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"); +#else + MessageBox.Show(null,"ERROR: No path for flash projector specified on this platform", "Porting error", MessageBoxButtons.Ok); +#endif + + +#if OS_LINUX + clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle_mapfix.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); +#else + clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); +#endif clientProcess.StartInfo.RedirectStandardOutput = true; clientProcess.StartInfo.RedirectStandardError = true; @@ -191,27 +204,41 @@ namespace MPN00BS public static void SetBaseDir() { - +#if OS_WINDOWS string hispFolder = Environment.GetEnvironmentVariable("APPDATA"); if (hispFolder == null) return; BaseDir = Path.Combine(hispFolder, "HISP", "N00BS"); Directory.CreateDirectory(BaseDir); +#elif OS_LINUX + string hispFolder = Environment.GetEnvironmentVariable("HOME"); + if (hispFolder == null) + return; + + BaseDir = Path.Combine(hispFolder, ".HISP", "N00BS"); +#endif } public static void StartHttpServer() { SetBaseDir(); try { - cs = new ContentServer("127.0.0.1"); - string[] fileList = Directory.GetFiles(Path.Combine(Directory.GetCurrentDirectory(), "client"), "*", SearchOption.AllDirectories); - foreach (string file in fileList) + +#if OS_LINUX + cs = new ContentServer("127.0.0.1", 12322); +#else + cs = new ContentServer("127.0.0.1", 80); +#endif + string clientFolder = Path.Combine(Directory.GetCurrentDirectory(), "client"); + string[] fileList = Directory.GetFiles(clientFolder, "*", SearchOption.AllDirectories); + foreach (string file in fileList){ addToList(file); + } } catch (Exception e) { - MessageBox.Show(null, "Web server failed to start: " + e.Message, "Error starting web server", MessageBoxButtons.Ok); + MessageBox.Show(null, "Web server failed to start: "+ e.GetType().Name + " " + e.Message, "Error starting web server", MessageBoxButtons.Ok); return; } diff --git a/HorseIsleServer/MPN00BS/flashplayer/LINUX/flash.elf b/HorseIsleServer/MPN00BS/flashplayer/LINUX/flash.elf new file mode 100755 index 0000000..504435c Binary files /dev/null and b/HorseIsleServer/MPN00BS/flashplayer/LINUX/flash.elf differ diff --git a/HorseIsleServer/MPN00BS/flashplayer/WINDOWS/flash.exe b/HorseIsleServer/MPN00BS/flashplayer/WINDOWS/flash.exe old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/icon.ico b/HorseIsleServer/MPN00BS/icon.ico old mode 100644 new mode 100755 diff --git a/HorseIsleServer/MPN00BS/server.properties b/HorseIsleServer/MPN00BS/server.properties new file mode 100755 index 0000000..b7a6ff6 --- /dev/null +++ b/HorseIsleServer/MPN00BS/server.properties @@ -0,0 +1,99 @@ +# ======================= +# Horse Isle Server Configuration +# ======================= +# +# HISP was Created and Developed by 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) + +ip=0.0.0.0 + +# Port the server will bind to defaults: (on beta.horseisle.com: 12321, on pinto.horseisle.com: 443) +# Though, 443 is likely to interfere with TLS, if you happen to have a web server or something +# running on the same port, so i prefer 12321. +port=12321 + +# 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. +db_ip=127.0.0.1 +db_name=game1 +db_username=root +db_password=test123 +db_port=3306 + +# Connect to a sqllite database instead of a sql server. +sql_lite=false + +# File that contains the map tile data +# the default was downloaded from the original server +map=HI1.MAP + +# 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 +# ======================= + +# Adobe Flash; Cross-Domain Policy File. (see: https://web.archive.org/web/20170610235331if_/http://www.adobe.com/devnet/flashplayer/articles/socket_policy_files.html) +# The default file, just allows all domains access to all ports. +crossdomain=CrossDomainPolicy.xml + +# ======================= +# Chat Filter Settings +# ======================= + +# Wether to block 'bad' words +# ex 'Fuck You!' gets blocked +enable_word_filter=true + +# Wether to expand slang. +# ex 'lol' becomes '*laughing out loud!*' +# (NOTE: This feature is also used to filter some less-'bad' words disabling it will allow users to say them!) +enable_corrections=true + +# Include non-violations +# stuff like blocking you from saying your password in chat +# and FULL CAPS messages. +enable_non_violation_check=true + +# Limits ad and global chat +# to just a few messages every minute +# by each user +enable_spam_filter=true + +# ======================= +# Misc Settings. +# ======================= + +# Should the server consider all users "Subscribers" +# (warning: makes ranches be in use forever.) +all_users_subscribed=false + +# Red Text Stating "Todays Note:" +# Default is "April 11, 2020. New breed, Camarillo White Horse. Two new quests." +motd=April 11, 2020. New breed, Camarillo White Horse. Two new quests. + +# Equation is: BANK_BALANCE * (1/INTREST_RATE); +# on All servers except Black its 3333, on black its 1000. +# but of course you can make it whatever you want +intrest_rate=3333 + +# Should i fix bugs all the bugs +# That were in the original Horse Isle Game?? +# (eg training, special treat, ranch descriptions, etc) +fix_offical_bugs=false + +# Should print extra debug logs +# 0 - no logs +# 1 - errors only +# 2 - errors, warnings +# 3 - errors, warnings, hackers +# 4 - errors, warnings, hackers, info, +# 5 - debug, errors, warnings, info, hackers +log_level=4 \ No newline at end of file diff --git a/HorseIsleServer/prebuild.py b/HorseIsleServer/prebuild.py old mode 100644 new mode 100755 diff --git a/HorseIsleWeb b/HorseIsleWeb index 6386530..d88992f 160000 --- a/HorseIsleWeb +++ b/HorseIsleWeb @@ -1 +1 @@ -Subproject commit 6386530f3c31ef95dcd995231a8f1f3f71162282 +Subproject commit d88992f75c774296276308e3afa9eecc415c4999 diff --git a/MigrationSQL/migrate-1.0-to-1.1.sql b/MigrationSQL/migrate-1.0-to-1.1.sql old mode 100644 new mode 100755 diff --git a/MigrationSQL/migrate-1.1-to-1.2.sql b/MigrationSQL/migrate-1.1-to-1.2.sql old mode 100644 new mode 100755 diff --git a/MigrationSQL/migrate-1.2-to-1.8.sql b/MigrationSQL/migrate-1.2-to-1.8.sql old mode 100644 new mode 100755