From dd99e49ef71457d092c3ed1792a95f95385a6223 Mon Sep 17 00:00:00 2001 From: Li Date: Sun, 8 May 2022 17:36:15 +1200 Subject: [PATCH] Fix %MESSAGE --- HorseIsleData | 2 +- HorseIsleServer/HISPd/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/HISPd/Resources/DEBIAN/control | 2 +- HorseIsleServer/LibHISP/Game/Chat/Command.cs | 2 +- HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/LibHISP/Server/Entry.cs | 6 ++---- HorseIsleServer/N00BS/Properties/AssemblyInfo.cs | 4 ++-- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/HorseIsleData b/HorseIsleData index 3b4fce8..980a45b 160000 --- a/HorseIsleData +++ b/HorseIsleData @@ -1 +1 @@ -Subproject commit 3b4fce89318c9c3cde64677d611092e23da4ae53 +Subproject commit 980a45b931fdabd11ae5c84b85557e3af4f6a168 diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 5e4e313..47ac989 100644 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/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.4.0")] -[assembly: AssemblyFileVersion("1.7.4.0")] +[assembly: AssemblyVersion("1.7.11.0")] +[assembly: AssemblyFileVersion("1.7.11.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index f7ded21..1d9f8e1 100644 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.7.4 +Version: 1.7.11 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/Game/Chat/Command.cs b/HorseIsleServer/LibHISP/Game/Chat/Command.cs index ff4bf21..4b60687 100644 --- a/HorseIsleServer/LibHISP/Game/Chat/Command.cs +++ b/HorseIsleServer/LibHISP/Game/Chat/Command.cs @@ -72,7 +72,7 @@ namespace HISP.Game.Chat string serverAnnoucement = String.Join(" ", args); byte[] chatLeftPacket = PacketBuilder.CreateChat(Messages.FormatServerAnnoucement(serverAnnoucement), PacketBuilder.CHAT_BOTTOM_LEFT); - byte[] chatRightPacket = PacketBuilder.CreateChat(Messages.FormatServerAnnoucement(serverAnnoucement), PacketBuilder.CHAT_BOTTOM_LEFT); + byte[] chatRightPacket = PacketBuilder.CreateChat(Messages.FormatServerAnnoucement(serverAnnoucement), PacketBuilder.CHAT_BOTTOM_RIGHT); foreach (GameClient client in GameClient.ConnectedClients) { diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 4344459..51a53f4 100644 --- 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.4.0")] -[assembly: AssemblyFileVersion("1.7.4.0")] +[assembly: AssemblyVersion("1.7.11.0")] +[assembly: AssemblyFileVersion("1.7.11.0")] diff --git a/HorseIsleServer/LibHISP/Server/Entry.cs b/HorseIsleServer/LibHISP/Server/Entry.cs index 732b3d2..21c10e4 100644 --- a/HorseIsleServer/LibHISP/Server/Entry.cs +++ b/HorseIsleServer/LibHISP/Server/Entry.cs @@ -64,11 +64,9 @@ namespace HISP.Server Logger.ErrorPrint("HISP HAS CRASHED :("); Logger.ErrorPrint("Unhandled Exception: " + execpt.ToString()); - Logger.ErrorPrint(execpt.Message); - Logger.ErrorPrint(""); Logger.ErrorPrint(execpt.StackTrace); - - while (true) { /* Allow asyncronous operations to happen. */ }; + + new EventWaitHandle(false, EventResetMode.ManualReset).WaitOne(); } } } diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs index 1d7aa8a..2d772e8 100644 --- a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/N00BS/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.4.0")] -[assembly: AssemblyFileVersion("1.7.4.0")] +[assembly: AssemblyVersion("1.7.11.0")] +[assembly: AssemblyFileVersion("1.7.11.0")]