Changeset 233 for binary-improvements/AllocsCommands

Timestamp:

Apr 30, 2015, 1:55:16 AM (10 years ago)

Author:

alloc

Message:

Fixes for 11.4

Location:

binary-improvements/AllocsCommands

Files:

• AllocsCommands.csproj (modified) (2 diffs)
• Commands/ListKnownPlayers.cs (modified) (1 diff)
• Commands/ListLandProtection.cs (modified) (1 diff)
• Commands/Reply.cs (modified) (1 diff)
• Commands/ShowInventory.cs (modified) (1 diff)

binary-improvements/AllocsCommands/AllocsCommands.csproj

@@ -42 +42 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Commands\Give.cs" />
-    <Compile Include="Commands\ListItems.cs" />
     <Compile Include="Commands\ListKnownPlayers.cs" />
     <Compile Include="Commands\ListLandProtection.cs" />
@@ -52 +51 @@
     <Compile Include="PrivateMassageConnections.cs" />
     <Compile Include="Chat.cs" />
+    <Compile Include="Commands\ListItems.cs" />
+    <Compile Include="Commands\GenerateItemIcons.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

@@ -38 +38 @@
                                 int num = 0;
                                 foreach (string sid in PersistentContainer.Instance.Players.SteamIDs) {
-                                        Player p = PersistentContainer.Instance.Players [sid];
+                                        Player p = PersistentContainer.Instance.Players [sid, false];
 
                                         if (

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -86 +86 @@
                                         foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
                                                 if (steamIdFilter.Length == 0 || kvp.Key.PlayerId.Equals (steamIdFilter)) {
-                                                        string name = PersistentData.PersistentContainer.Instance.Players [kvp.Key.PlayerId].Name;
+                                                        PersistentData.Player p = PersistentData.PersistentContainer.Instance.Players [kvp.Key.PlayerId, false];
+                                                        string name = string.Empty;
+                                                        if (p != null) {
+                                                                name = p.Name;
+                                                        }
                                                         name += " (" + kvp.Key.PlayerId + ")";
 

binary-improvements/AllocsCommands/Commands/Reply.cs

@@ -26 +26 @@
 
                         ClientInfo receiver = PrivateMassageConnections.GetLastPMSenderForPlayer (_sender);
-                        if (receiver != null && receiver.clientId >= 0) {
+                        if (receiver != null) {
                                 Chat.SendMessage (receiver, _sender, message);
                         } else {

binary-improvements/AllocsCommands/Commands/ShowInventory.cs

@@ -31 +31 @@
                                 }
 
-                                Player p = PersistentContainer.Instance.Players [steamid];
+                                Player p = PersistentContainer.Instance.Players [steamid, false];
                                 PersistentData.Inventory inv = p.Inventory;