From c02c09a2374f8313a45d48bbcd90fcfaafaa8ce6 Mon Sep 17 00:00:00 2001
From: TheManii <TheManiitsnv@gmail.com>
Date: Mon, 9 May 2016 01:15:58 -0400
Subject: [PATCH] Bugfixed with !test

---
 FFXIVClassic Map Server/CommandProcessor.cs   | 55 +++++++++++--------
 .../packets/send/SetWeatherPacket.cs          |  2 +-
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/FFXIVClassic Map Server/CommandProcessor.cs b/FFXIVClassic Map Server/CommandProcessor.cs
index b23d6ac1..4c4d63d4 100644
--- a/FFXIVClassic Map Server/CommandProcessor.cs	
+++ b/FFXIVClassic Map Server/CommandProcessor.cs	
@@ -456,8 +456,6 @@ namespace FFXIVClassic_Lobby_Server
 
         private void doWeather(ConnectedPlayer client, string weatherID)
         {
-            
-
             long weather = Convert.ToInt64(weatherID);
 
             if (client != null)
@@ -554,37 +552,46 @@ namespace FFXIVClassic_Lobby_Server
                         else if (split[1].Equals("setgraphic"))
                                sendMessage(client, Resources.CPsetgraphic);
                         */
-					 }
-					if (split.Length == 3)
-					{
-						if(split[1].Equals("test"))
-						{
-							if (split[2].Equals("weather"))
-								sendMessage(client, Resources.CPtestweather);
-						}
-					}
+                     }
+                    if (split.Length == 3)
+                    {
+                        if(split[1].Equals("test"))
+                        {
+                            if (split[2].Equals("weather"))
+                                sendMessage(client, Resources.CPtestweather);
+                        }
+                    }
 
                     return true;
                 }
                 #endregion
 
-                #region !dev
+                #region !test
                 else if (split[0].Equals("test"))
                 {
-                    #region !test weather
-                    if (split[1].Equals("weather"))
+                    if (split.Length == 1)
                     {
-                        try
-                        {
-                            doWeather(client, split[2]);
-                            return true;
-                        }
-                        catch (Exception e)
-                        {
-                            Log.error("Could not change weather: " + e);
-                        }     
+                        // catch invalid commands
+                        sendMessage(client, Resources.CPhelp);
                     }
-                    #endregion
+                    else if (split.Length >= 2)
+                    {
+                        #region !test weather
+                        if (split[1].Equals("weather"))
+                        {
+                            try
+                            {
+                                doWeather(client, split[2]);
+                                return true;
+                            }
+                            catch (Exception e)
+                            {
+                                Log.error("Could not change weather: " + e);
+                            }
+                        }
+                        #endregion
+                    }
+
                 }
                 #endregion
 
diff --git a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs
index dd2da746..90e863e4 100644
--- a/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs	
+++ b/FFXIVClassic Map Server/packets/send/SetWeatherPacket.cs	
@@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send
                                                                 // 8018 - 8026 / 73554 - 73562 - NOT SUPPORTED in v1.23b
         public const uint WEATHER_SEASONAL          = 0x011F5B; // 8027 / 73563 - Snow in Black Shroud, nothing elsewhere
         public const uint WEATHER_PRIMAL            = 0x011F5C; // 8028 / 73564 - Howling Eye and Thornmarch Weather
-                                                                // 8029 / 73565 - Not supported
+                                                                // 8029 / 73565 - NOT SUPPOPORTED in v1.23b
         public const uint WEATHER_DALAMUD           = 0x011F5E; // 8030 / 73566
         public const uint WEATHER_AURORA            = 0x011F5F; // 8031 / 73567
         public const uint WEATHER_DALAMUDTHUNDER    = 0x011F60; // 8032 / 73568