diff --git a/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs b/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs
index 2f98d51..e329e2a 100644
--- a/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs
+++ b/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs
@@ -23,7 +23,7 @@ namespace HISP.Game.Events
public bool Active;
public int Reward;
private Timer riddleTimeout;
- private const int RIDDLE_TIMEOUT = 30;
+ private const int RIDDLE_TIMEOUT = 5;
public static RealTimeRiddle GetRandomRiddle()
{
diff --git a/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj
index 5126f7a..fd5c1d3 100755
--- a/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj
+++ b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs
index d64884b..26ce2be 100755
--- a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs
+++ b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs
@@ -3523,6 +3523,10 @@ namespace HISP.Server
byte[] MotdData = PacketBuilder.CreateMotd();
sender.SendPacket(MotdData);
+ // Send riddle annoucement
+ if (RiddleEvent != null)
+ if (RiddleEvent.Active)
+ RiddleEvent.ShowStartMessage(sender);
// Send Queued Messages
string[] queuedMessages = Database.GetMessageQueue(sender.LoggedinUser.Id);