Moved clan data to binary file

dmustanger · Oct 30, 2016 · bc640ea · bc640ea
1 parent c80d807
commit bc640ea
Show file tree

Hide file tree

Showing 11 changed files with 313 additions and 728 deletions.
diff --git a/.vs/ServerTools/v14/.suo b/.vs/ServerTools/v14/.suo
diff --git a/ServerTools/Changelog.txt b/ServerTools/Changelog.txt
@@ -1,8 +1,11 @@
 v3.7
-Removed chat command /delhome
-Moved Gimme, Killme and Sethome data to a binary file
-Todo move clan data to binary file
-Add /re chat command to whisper
+Added Reserved Slot console command
+Fixed /sethome no longer spawns player at the highest point
+Fixed /home still not saving players positions after server reboots
+Changed Reserved slots will now observe expired date/time in reservedslots.xml
+Changed Removed chat command /delhome, players can now just set a new home
+Changed Moved Gimme, Killme, Clan and Sethome data to a binary file
+Changed Added a usage response for /clan commands if no params were given
 
 v3.6
 Added console command stopserver. Will stop the game server with a chat warning countdown every minute. Usage: stopserver <minutes>

diff --git a/ServerTools/ServerTools.csproj b/ServerTools/ServerTools.csproj
@@ -47,8 +47,8 @@
     <Compile Include="src\Chat\InfoTicker.cs" />
     <Compile Include="src\Chat\Log.cs" />
     <Compile Include="src\Chat\Motd.cs" />
-    <Compile Include="src\ClanManager\ClanData.cs" />
     <Compile Include="src\ClanManager\ClanManager.cs" />
+    <Compile Include="src\ConsoleCommands\ReservedSlots.cs" />
     <Compile Include="src\ConsoleCommands\StopServer.cs" />
     <Compile Include="src\Functions\LoadConfig.cs" />
     <Compile Include="src\Functions\LoadGameItems.cs" />
@@ -68,6 +68,9 @@
     <Compile Include="src\Watchlist\Watchlist.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="ConsoleCommandExamples.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="ModInfo.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/ServerTools/src/Chat/Hook.cs b/ServerTools/src/Chat/Hook.cs
@@ -202,10 +202,11 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                             if (_message == "clancommands")
                             {
                                 ClanManager.GetChatCommands(_cInfo);
+                                return false;
                             }
-                            if (_message.StartsWith("clandad"))
+                            if (_message.StartsWith("clanadd"))
                             {
-                                if(_message == "clandad")
+                                if(_message == "clanadd")
                                 {
                                     _cInfo.SendPackage(new NetPackageGameMessage(EnumGameMessages.Chat, string.Format("{0}Usage: /clanadd clanName[-]", CustomCommands.ChatColor), "Server", false, "ServerTools", false));
                                 }
@@ -214,10 +215,12 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                                     _message = _message.Replace("clanadd ", "");
                                     ClanManager.AddClan(_cInfo, _message);
                                 }
+                                return false;
                             }
                             if (_message == "clandel")
                             {
                                 ClanManager.RemoveClan(_cInfo);
+                                return false;
                             }
                             if (_message.StartsWith("claninvite"))
                             {
@@ -230,14 +233,17 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                                     _message = _message.Replace("claninvite ", "");
                                     ClanManager.InviteMember(_cInfo, _message);
                                 }
+                                return false;
                             }
                             if (_message == "clanaccept")
                             {
                                 ClanManager.InviteAccept(_cInfo);
+                                return false;
                             }
                             if (_message == "clandecline")
                             {
                                 ClanManager.InviteDecline(_cInfo);
+                                return false;
                             }
                             if (_message.StartsWith("clanremove"))
                             {
@@ -250,6 +256,7 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                                     _message = _message.Replace("clanremove ", "");
                                     ClanManager.RemoveMember(_cInfo, _message);
                                 }
+                                return false;
                             }
                             if (_message.StartsWith("clanpromote"))
                             {
@@ -262,6 +269,7 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                                     _message = _message.Replace("clanpromote ", "");
                                     ClanManager.PromoteMember(_cInfo, _message);
                                 }
+                                return false;
                             }
                             if (_message.StartsWith("clandemote"))
                             {
@@ -273,11 +281,13 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                                 {
                                     _message = _message.Replace("clandemote ", "");
                                     ClanManager.DemoteMember(_cInfo, _message);
-                                }   
+                                }
+                                return false;
                             }
                             if (_message == "clanleave")
                             {
                                 ClanManager.LeaveClan(_cInfo);
+                                return false;
                             }
                             if (_message.StartsWith("clan"))
                             {
@@ -290,6 +300,7 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                                     _message = _message.Replace("clan ", "");
                                     ClanManager.Clan(_cInfo, _message);
                                 }
+                                return false;
                             }
                             if (_message.StartsWith("c"))
                             {
@@ -302,6 +313,7 @@ public static bool Hook(ClientInfo _cInfo, string _message, string _playerName,
                                     _message = _message.Replace("c ", "");
                                     ClanManager.Clan(_cInfo, _message);
                                 }
+                                return false;
                             }
                         }
                         else