Changeset 163 for binary-improvements/7dtd-server-fixes

Timestamp:

Sep 4, 2014, 5:45:22 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (1 diff)
• src/CommandExtensions.cs (modified) (1 diff)
• src/CustomCommands/TeleportPlayer.cs (added)
• src/NetConnections/Servers/Web/API/GetPlayerInventory.cs (added)
• src/NetConnections/Servers/Web/ApiHandler.cs (modified) (1 diff)
• src/NetConnections/Servers/Web/Web.cs (modified) (1 diff)
• src/PersistentData/Inventory.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -110 +110 @@
     <Compile Include="src\JSON\JSONBoolean.cs" />
     <Compile Include="src\NetConnections\Servers\Web\API\GetPlayersLocation.cs" />
+    <Compile Include="src\CustomCommands\TeleportPlayer.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\API\GetPlayerInventory.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs

@@ -10 +10 @@
                 {
                         try {
-                                manager.m_GUIConsole.AddCommand (new CreativeMenu (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new EnableRendering (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new GetGamePrefs (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new GetTime (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new Give (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new Kill (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new ListItems (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new ListKnownPlayers (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new ListLandProtection (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new ListPlayersExtended (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new RemoveLandProtection (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new RenderMap (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new Reply (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new SayToPlayer (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new SetTimeReal (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new ShowInventory (manager.m_GUIConsole));
-                                manager.m_GUIConsole.AddCommand (new AllocsFixes.CustomCommands.Version (manager.m_GUIConsole));
+                                ConsoleSdtd cons = manager.m_GUIConsole;
+                                cons.AddCommand (new CreativeMenu (cons));
+                                cons.AddCommand (new EnableRendering (cons));
+                                cons.AddCommand (new GetGamePrefs (cons));
+                                cons.AddCommand (new GetTime (cons));
+                                cons.AddCommand (new Give (cons));
+                                cons.AddCommand (new Kill (cons));
+                                cons.AddCommand (new ListItems (cons));
+                                cons.AddCommand (new ListKnownPlayers (cons));
+                                cons.AddCommand (new ListLandProtection (cons));
+                                cons.AddCommand (new ListPlayersExtended (cons));
+                                cons.AddCommand (new RemoveLandProtection (cons));
+                                cons.AddCommand (new RenderMap (cons));
+                                cons.AddCommand (new Reply (cons));
+                                cons.AddCommand (new SayToPlayer (cons));
+                                cons.AddCommand (new SetTimeReal (cons));
+                                cons.AddCommand (new ShowInventory (cons));
+                                cons.AddCommand (new TeleportPlayer (cons));
+                                cons.AddCommand (new AllocsFixes.CustomCommands.Version (cons));
                         } catch (Exception e) {
                                 Log.Out ("Error registering custom commands: " + e);

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs

@@ -18 +18 @@
                         apis.Add ("getplayersonline", new GetPlayersOnline ());
                         apis.Add ("getplayerslocation", new GetPlayersLocation ());
+                        apis.Add ("getplayerinventory", new GetPlayerInventory ());
                 }
 

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs

@@ -120 +120 @@
                 }
 
+                public static void SetResponseTextContent (HttpListenerResponse resp, string text)
+                {
+                        byte[] buf = Encoding.UTF8.GetBytes (text);
+                        resp.ContentLength64 = buf.Length;
+                        resp.ContentType = "text/html";
+                        resp.ContentEncoding = Encoding.UTF8;
+                        resp.OutputStream.Write (buf, 0, buf.Length);
+                }
+
         }
 }

binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

@@ -48 +48 @@
                 {
                         ItemBase iBase = ItemBase.list [item.itemValue.type];
-                        string name = iBase.name;
-                        if (iBase.IsBlock ()) {
-                                ItemBlock iBlock = (ItemBlock)iBase;
-                                name = iBlock.GetItemName (item.itemValue);
-                        }
-                        return name;
+                        return iBase.GetItemName(item.itemValue);
                 }