Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battle Pets: Fixed possible crash in packet handler

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ce8f9b9a4efc8a3f110465db5310f08067658f60)
This commit is contained in:
hondacrx
2019-11-13 19:13:56 -05:00
parent 289f7a735a
commit ae593507e6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattlePets/BattlePetManager.cs
+1 -1
View File
@@ -454,7 +454,7 @@ namespace Game.BattlePets
_owner.SendPacket(battlePetError); _owner.SendPacket(battlePetError);
} }
public BattlePetSlot GetSlot(byte slot) { return _slots[slot]; } public BattlePetSlot GetSlot(byte slot) { return slot < _slots.Count ? _slots[slot] : null; }
WorldSession GetOwner() { return _owner; } WorldSession GetOwner() { return _owner; }
public ushort GetTrapLevel() { return _trapLevel; } public ushort GetTrapLevel() { return _trapLevel; }
Source/Game/Handlers/BattlePetHandler.cs
+5 -1
View File
@@ -35,7 +35,11 @@ namespace Game
{ {
BattlePetMgr.BattlePet pet = GetBattlePetMgr().GetPet(battlePetSetBattleSlot.PetGuid); BattlePetMgr.BattlePet pet = GetBattlePetMgr().GetPet(battlePetSetBattleSlot.PetGuid);
if (pet != null) if (pet != null)
GetBattlePetMgr().GetSlot(battlePetSetBattleSlot.Slot).Pet = pet.PacketInfo; {
BattlePetSlot slot = GetBattlePetMgr().GetSlot(battlePetSetBattleSlot.Slot);
if (slot != null)
slot.Pet = pet.PacketInfo;
}
} }
[WorldPacketHandler(ClientOpcodes.BattlePetModifyName)] [WorldPacketHandler(ClientOpcodes.BattlePetModifyName)]