Merge remote-tracking branch 'upstream/cypher_proxy' into cypher_proxy

coolzoom · May 19, 2022 · a4e8ae4 · a4e8ae4
2 parents 8c7bbd0 + 8b659e0
commit a4e8ae4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs
@@ -481,7 +481,8 @@ void HandlePvPCredit(WorldPacket packet)
         void HandlePlayerSkinned(WorldPacket packet)
         {
             PlayerSkinned skinned = new PlayerSkinned();
-            skinned.FreeRepop = packet.ReadBool();
+            if (packet.CanRead())
+                skinned.FreeRepop = packet.ReadBool();
             SendPacketToClient(skinned);
         }
     }

diff --git a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs
@@ -382,7 +382,12 @@ void HandleQueryGameObjectResposne(WorldPacket packet)
             }
 
             for (int i = 0; i < 24; i++)
+            {
+                if (!packet.CanRead())
+                    break;
+
                 gameObject.Data[i] = packet.ReadInt32();
+            }
 
             if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056))
                 gameObject.Size = packet.ReadFloat();

diff --git a/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs
@@ -316,6 +316,9 @@ void HandleSpellFailedOther(WorldPacket packet)
         [PacketHandler(Opcode.SMSG_SPELL_START)]
         void HandleSpellStart(WorldPacket packet)
         {
+            if (GetSession().GameState.CurrentMapId == null)
+                return;
+
             SpellStart spell = new SpellStart();
             spell.Cast = HandleSpellStartOrGo(packet, false);
 
@@ -375,6 +378,9 @@ void HandleSpellStart(WorldPacket packet)
         [PacketHandler(Opcode.SMSG_SPELL_GO)]
         void HandleSpellGo(WorldPacket packet)
         {
+            if (GetSession().GameState.CurrentMapId == null)
+                return;
+
             SpellGo spell = new SpellGo();
             spell.Cast = HandleSpellStartOrGo(packet, true);
             if (GetSession().GameState.CurrentPlayerGuid == spell.Cast.CasterUnit &&