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

Timestamp:

Sep 7, 2014, 8:16:54 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (1 diff)
• src/CustomCommands/ShowInventory.cs (modified) (2 diffs)
• src/CustomCommands/TeleportPlayer.cs (modified) (2 diffs)
• src/NetConnections/Servers/Telnet/TelnetConnection.cs (modified) (3 diffs)
• src/NetConnections/Servers/Web/API/GetLandClaims.cs (added)
• src/NetConnections/Servers/Web/ApiHandler.cs (modified) (1 diff)

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

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

binary-improvements/7dtd-server-fixes/src/CustomCommands/ShowInventory.cs

@@ -38 +38 @@
                                 PersistentData.Inventory inv = p.Inventory;
 
-                                m_Console.SendResult ("Belt of player:");
+                                m_Console.SendResult ("Belt of player " + p.Name + ":");
                                 for (int i = 0; i < inv.belt.Count; i++) {
                                         if (inv.belt [i] != null)
@@ -44 +44 @@
                                 }
                                 m_Console.SendResult (string.Empty);
-                                m_Console.SendResult ("Bagpack of player:");
+                                m_Console.SendResult ("Bagpack of player " + p.Name + ":");
                                 for (int i = 0; i < inv.bag.Count; i++) {
                                         if (inv.bag [i] != null)

binary-improvements/7dtd-server-fixes/src/CustomCommands/TeleportPlayer.cs

@@ -54 +54 @@
                                         p.Entity.position.y = y;
                                         p.Entity.position.z = z;
-                                        NetPackage_EntityPosAndRot pkg = new NetPackage_EntityPosAndRot(p.Entity);
+                                        NetPackage_EntityPosAndRot pkg = new NetPackage_EntityPosAndRot (p.Entity);
 
-                                        p.ClientInfo.netConnection[0].mdv0005(pkg);
+                                        p.ClientInfo.netConnection [0].Send (pkg);
                                 }
                         } catch (Exception e) {
@@ -62 +62 @@
                         }
                 }
+
         }
 }

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

@@ -41 +41 @@
                                 if (!IsClosed () && stream.CanWrite) {
                                         byte[] utfData = Encoding.UTF8.GetBytes (s);
-                                        stream.Write(utfData, 0, utfData.Length);
+                                        stream.Write (utfData, 0, utfData.Length);
                                         WriteByte (13);
                                         WriteByte (10);
@@ -80 +80 @@
                                 int b = stream.ReadByte ();
                                 if (b == '\r' || b == '\n') {
-                                        if (lineBufferLength > 0)
+                                        if (lineBufferLength > 0) {
                                                 return true;
+                                        }
                                 } else if (b >= 0) {
-                                        lineBuffer[lineBufferLength] = (byte)b;
+                                        lineBuffer [lineBufferLength] = (byte)b;
                                         lineBufferLength++;
                                 }
@@ -92 +93 @@
                 public string GetLine ()
                 {
-                        string res = Encoding.UTF8.GetString(lineBuffer, 0, lineBufferLength);;
+                        string res = Encoding.UTF8.GetString (lineBuffer, 0, lineBufferLength);
                         lineBufferLength = 0;
                         return res;

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

@@ -16 +16 @@
                 {
                         this.staticPart = staticPart;
+                        apis.Add ("getlandclaims", new GetLandClaims ());
                         apis.Add ("getplayersonline", new GetPlayersOnline ());
                         apis.Add ("getplayerslocation", new GetPlayersLocation ());