Changeset 309 for binary-improvements/AllocsCommands

Timestamp:

Aug 9, 2017, 7:43:07 PM (7 years ago)

Author:

alloc

Message:

Fixes 14_16_21

Location:

binary-improvements/AllocsCommands

Files:

• AllocsCommands.csproj (modified) (1 diff)
• Commands/Reply.cs (modified) (1 diff)
• ModInfo.xml (modified) (1 diff)
• PrivateMessageConnections.cs (modified) (2 diffs)

binary-improvements/AllocsCommands/AllocsCommands.csproj

@@ -39 +39 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="Assembly-CSharp-firstpass">
+      <HintPath>..\..\..\RPGMod\7dtd-binaries\Assembly-CSharp-firstpass.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>

binary-improvements/AllocsCommands/Commands/Reply.cs

@@ -35 +35 @@
                                 Chat.SendMessage (receiver, _sender, message);
                         } else {
-                                if (receiver != null) {
-                                        SdtdConsole.Instance.Output ("The sender of the PM you last received is currently not online.");
-                                } else {
-                                        SdtdConsole.Instance.Output ("You have not received a PM so far.");
-                                }
+                                SdtdConsole.Instance.Output ("You have not received a PM so far or sender of last received PM is no longer online.");
                         }
                 }

binary-improvements/AllocsCommands/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Additional commands for server operation" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="13" />
+                <Version value="14" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/AllocsCommands/PrivateMessageConnections.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using Steamworks;
 
 namespace AllocsFixes.CustomCommands
@@ -6 +7 @@
         public class PrivateMessageConnections
         {
-                private static Dictionary<ClientInfo, ClientInfo> senderOfLastPM = new Dictionary<ClientInfo, ClientInfo> ();
+                private static Dictionary<CSteamID, CSteamID> senderOfLastPM = new Dictionary<CSteamID, CSteamID> ();
 
                 public static void SetLastPMSender (ClientInfo _sender, ClientInfo _receiver)
                 {
-                        if (senderOfLastPM.ContainsKey (_receiver))
-                                senderOfLastPM [_receiver] = _sender;
-                        else
-                                senderOfLastPM.Add (_receiver, _sender);
+                        senderOfLastPM [_receiver.steamId] = _sender.steamId;
                 }
 
                 public static ClientInfo GetLastPMSenderForPlayer (ClientInfo _player)
                 {
-                        if (senderOfLastPM.ContainsKey (_player))
-                                return senderOfLastPM [_player];
+                        if (senderOfLastPM.ContainsKey (_player.steamId)) {
+                                CSteamID recSteamId = senderOfLastPM [_player.steamId];
+                                ClientInfo recInfo = ConnectionManager.Instance.GetClientInfoForSteamId (recSteamId);
+                                return recInfo;
+                        }
                         return null;
                 }