Minor updates

ravahn · Mar 18, 2018 · 909570b · 909570b
2 parents f0ed9d9 + 8987830
commit 909570b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Machina.FFXIV/FFXIVBundleDecoder.cs b/Machina.FFXIV/FFXIVBundleDecoder.cs
@@ -77,14 +77,7 @@ public unsafe void StoreData(byte[] buffer)
                             if (LastMessageTimestamp != DateTime.MinValue)
                                 Trace.WriteLine("FFXIVBundleDecoder: Invalid magic # in header:" + Utility.ByteArrayToHexString(_bundleBuffer, offset, 36));
 
-                            offset = GetNextMagicNumberPos(_bundleBuffer, offset);
-                            if (offset == -1)
-                            {
-                                //reset stream
-                                _allocated = 0;
-                                _bundleBuffer = null;
-                                return;
-                            }
+                            offset = ResetStream(offset);
                             continue;
                         }
 
@@ -100,12 +93,10 @@ public unsafe void StoreData(byte[] buffer)
                     }
                     int messageBufferSize;
                     byte[] message = DecompressFFXIVMessage(ref header, _bundleBuffer, offset, out messageBufferSize);
-
-                    // Handle error condition from decompression - stream may be invalid.
-                    if (message == null)
+                    if (message == null || messageBufferSize <= 0)
                     {
-                        _allocated = 0;
-                        return;
+                        offset = ResetStream(offset);
+                        continue;
                     }
 
                     offset += header.length;
@@ -199,6 +190,18 @@ private unsafe byte[] DecompressFFXIVMessage(ref FFXIVBundleHeader header, byte[
             return _decompressionBuffer;
         }
 
+        private unsafe int ResetStream(int offset)
+        {
+            offset = GetNextMagicNumberPos(_bundleBuffer, offset);
+            if (offset == -1)
+            {
+                //reset stream
+                _allocated = 0;
+                _bundleBuffer = null;
+            }
+
+            return offset;
+        }
 
         private unsafe int GetNextMagicNumberPos(byte[] buffer, int offset)
         {

diff --git a/Machina.FFXIV/Headers/FFXIMessageHeader.cs b/Machina.FFXIV/Headers/FFXIMessageHeader.cs
@@ -33,6 +33,7 @@ public enum ServerMessageType : ushort
         ActorCast = 0x0162,
         AddStatusEffect = 0x0141,
         ActorControl142 = 0x0142,
+        ActorControl143 = 0x0143,
         ActorControl144 = 0x0144,
         //ActorSpawn = 0x0190,
         ActorGauge = 0x027d