Changeset 238 for binary-improvements/7dtd-server-fixes/src

Timestamp:

Jul 3, 2015, 4:16:11 PM (9 years ago)

Author:

alloc

Message:

Server fixes for A12

Location:

binary-improvements/7dtd-server-fixes/src

Files:

• API.cs (modified) (1 diff)
• AssemblyInfo.cs (modified) (1 diff)
• ChatHookExample.cs (added)
• ItemList.cs (modified) (2 diffs)
• PersistentData/Inventory.cs (modified) (2 diffs)
• PersistentData/PersistentContainer.cs (modified) (2 diffs)
• PersistentData/Player.cs (modified) (1 diff)

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

@@ -28 +28 @@
                 }
 
+                public override bool ChatMessage (ClientInfo _cInfo, string _message, string _playerName) {
+                        return ChatHookExample.Hook (_cInfo, _message, _playerName);
+                }
         }
 }

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

@@ -18 +18 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.11.6.0")]
+[assembly: AssemblyVersion("0.12.0.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 

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

@@ -45 +45 @@
                 {
                         NGuiInvGridCreativeMenu cm = new NGuiInvGridCreativeMenu ();
-                        foreach (InventoryField invF in cm.GetAllItems()) {
-                                ItemBase ib = ItemBase.list [invF.itemValue.type];
+                        foreach (ItemStack invF in cm.GetAllItems()) {
+                                ItemClass ib = ItemClass.list [invF.itemValue.type];
                                 string name = ib.GetItemName ();
                                 if (name != null && name.Length > 0) {
@@ -56 +56 @@
                                 }
                         }
-                        foreach (InventoryField invF in cm.GetAllBlocks()) {
-                                ItemBase ib = ItemBase.list [invF.itemValue.type];
+                        foreach (ItemStack invF in cm.GetAllBlocks()) {
+                                ItemClass ib = ItemClass.list [invF.itemValue.type];
                                 string name = ib.GetItemName ();
                                 if (name != null && name.Length > 0) {

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

@@ -25 +25 @@
                 }
 
-                private void ProcessInv (List<InvItem> target, InventoryField[] sourceFields, int id)
+                private void ProcessInv (List<InvItem> target, ItemStack[] sourceFields, int id)
                 {
                         lock (target) {
@@ -32 +32 @@
                                         if (sourceFields [i].count > 0) {
                                                 int count = sourceFields [i].count;
-                                                int maxAllowed = ItemBase.list [sourceFields [i].itemValue.type].Stacknumber.Value;
-                                                string name = ItemBase.list [sourceFields [i].itemValue.type].GetItemName ();
+                                                int maxAllowed = ItemClass.list [sourceFields [i].itemValue.type].Stacknumber.Value;
+                                                string name = ItemClass.list [sourceFields [i].itemValue.type].GetItemName ();
 
                                                 if (count > maxAllowed)

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

@@ -36 +36 @@
                 public void Save ()
                 {
-                        Stream stream = File.Open (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create);
+                        Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create);
                         BinaryFormatter bFormatter = new BinaryFormatter ();
                         bFormatter.Serialize (stream, this);
@@ -44 +44 @@
                 public static bool Load ()
                 {
-                        if (File.Exists (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
+                        if (File.Exists (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
                                 try {
                                         PersistentContainer obj;
-                                        Stream stream = File.Open (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
+                                        Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
                                         BinaryFormatter bFormatter = new BinaryFormatter ();
                                         obj = (PersistentContainer)bFormatter.Deserialize (stream);

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

@@ -135 +135 @@
                         name = ci.playerName;
                         ip = ci.ip;
+                        lastOnline = DateTime.Now;
                 }