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

Core/PacketIO: Convert all leftover packets to use packet classes

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/661470c6587c11e3fa94d2e8b57c92d8be2e297b)
This commit is contained in:
hondacrx
2020-07-14 23:00:31 -04:00
parent 4bb9823456
commit baa9ab6558
15 changed files with 251 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/BankHandler.cs
+3
View File
@@ -121,7 +121,10 @@ namespace Game
void HandleBuyBankSlot(BuyBankSlot packet)
{
if (!CanUseBank(packet.Guid))
{
Log.outDebug(LogFilter.Network, "WORLD: HandleBuyBankSlot - {0} not found or you can't interact with him.", packet.Guid.ToString());
return;
}
uint slot = GetPlayer().GetBankBagSlotCount();
// next slot
Source/Game/Handlers/BattleGroundHandler.cs
+2 -23
View File
@@ -580,29 +580,8 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.RequestRatedBattlefieldInfo)]
void HandleRequestRatedBattlefieldInfo(RequestRatedBattlefieldInfo packet)
{
// @Todo: perfome research in this case
// The unk fields are related to arenas
WorldPacket data = new WorldPacket(ServerOpcodes.RatedBattlefieldInfo);
data.WriteInt32(0); // BgWeeklyWins20vs20
data.WriteInt32(0); // BgWeeklyPlayed20vs20
data.WriteInt32(0); // BgWeeklyPlayed15vs15
data.WriteInt32(0);
data.WriteInt32(0); // BgWeeklyWins10vs10
data.WriteInt32(0);
data.WriteInt32(0);
data.WriteInt32(0);
data.WriteInt32(0); // BgWeeklyWins15vs15
data.WriteInt32(0);
data.WriteInt32(0);
data.WriteInt32(0);
data.WriteInt32(0);
data.WriteInt32(0);
data.WriteInt32(0);
data.WriteInt32(0); // BgWeeklyPlayed10vs10
data.WriteInt32(0);
data.WriteInt32(0);
//SendPacket(data);
RatedBattlefieldInfo ratedBattlefieldInfo = new RatedBattlefieldInfo();
SendPacket(ratedBattlefieldInfo);
}
[WorldPacketHandler(ClientOpcodes.GetPvpOptionsEnabled, Processing = PacketProcessing.Inplace)]
Source/Game/Handlers/ItemHandler.cs
+4 -4
View File
@@ -613,15 +613,15 @@ namespace Game
GetPlayer().StoreItem(dest, item, true);
}
public void SendEnchantmentLog(ObjectGuid owner, ObjectGuid caster, ObjectGuid itemGuid, uint itemId, uint enchantId, uint slot)
public void SendEnchantmentLog(ObjectGuid owner, ObjectGuid caster, ObjectGuid itemGuid, uint itemId, uint enchantId, uint enchantSlot)
{
EnchantmentLog packet = new EnchantmentLog();
packet.Caster = caster;
EnchantmentLog packet = new EnchantmentLog();
packet.Owner = owner;
packet.Caster = caster;
packet.ItemGUID = itemGuid;
packet.ItemID = itemId;
packet.Enchantment = enchantId;
packet.EnchantSlot = slot;
packet.EnchantSlot = enchantSlot;
GetPlayer().SendMessageToSet(packet, true);
}
Source/Game/Handlers/LootHandler.cs
+71 -72
View File
@@ -456,103 +456,102 @@ namespace Game
DoLootRelease(lootPair.Value);
}
//[WorldPacketHandler(ClientOpcodes.MasterLootItem)]
void HandleLootMasterGive(WorldPacket packet)
[WorldPacketHandler(ClientOpcodes.MasterLootItem)]
void HandleLootMasterGive(MasterLootItem masterLootItem)
{
ObjectGuid lootguid = packet.ReadPackedGuid();
byte slotid = packet.ReadUInt8();
ObjectGuid target_playerguid = packet.ReadPackedGuid();
AELootResult aeResult = new AELootResult();
if (GetPlayer().GetGroup() == null || GetPlayer().GetGroup().GetLooterGuid() != GetPlayer().GetGUID() || GetPlayer().GetGroup().GetLootMethod() != LootMethod.MasterLoot)
{
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.DidntKill);
GetPlayer().SendLootError(ObjectGuid.Empty, ObjectGuid.Empty, LootError.DidntKill);
return;
}
// player on other map
Player target = Global.ObjAccessor.GetPlayer(_player, target_playerguid);
Player target = Global.ObjAccessor.GetPlayer(_player, masterLootItem.Target);
if (!target)
{
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.PlayerNotFound);
GetPlayer().SendLootError(ObjectGuid.Empty, ObjectGuid.Empty, LootError.PlayerNotFound);
return;
}
Log.outDebug(LogFilter.Network, "HandleLootMasterGive (CMSG_LOOT_MASTER_GIVE, 0x02A3) Target = [{0}].", target.GetName());
if (GetPlayer().GetLootGUID() != lootguid)
foreach (LootRequest req in masterLootItem.Loot)
{
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.DidntKill);
return;
}
Loot loot = null;
ObjectGuid lootguid = _player.GetLootWorldObjectGUID(req.Object);
if (!GetPlayer().IsInRaidWith(target) || !GetPlayer().IsInMap(target))
{
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.MasterOther);
Log.outInfo(LogFilter.Loot, "MasterLootItem: Player {0} tried to give an item to ineligible player {1}!", GetPlayer().GetName(), target.GetName());
return;
}
if (!_player.IsInRaidWith(target) || !_player.IsInMap(target))
{
_player.SendLootError(req.Object, ObjectGuid.Empty, LootError.MasterOther);
Log.outInfo(LogFilter.Cheat, $"MasterLootItem: Player {GetPlayer().GetName()} tried to give an item to ineligible player {target.GetName()} !");
return;
}
Loot loot = null;
if (GetPlayer().GetLootGUID().IsCreatureOrVehicle())
{
Creature creature = GetPlayer().GetMap().GetCreature(lootguid);
if (!creature)
return;
if (GetPlayer().GetLootGUID().IsCreatureOrVehicle())
{
Creature creature = GetPlayer().GetMap().GetCreature(lootguid);
if (creature == null)
loot = creature.loot;
}
else if (GetPlayer().GetLootGUID().IsGameObject())
{
GameObject pGO = GetPlayer().GetMap().GetGameObject(lootguid);
if (!pGO)
return;
loot = pGO.loot;
}
if (loot == null)
return;
loot = creature.loot;
}
else if (GetPlayer().GetLootGUID().IsGameObject())
{
GameObject pGO = GetPlayer().GetMap().GetGameObject(lootguid);
if (pGO == null)
byte slotid = (byte)(req.LootListID - 1);
if (slotid >= loot.items.Count + loot.quest_items.Count)
{
Log.outDebug(LogFilter.Loot, $"MasterLootItem: Player {GetPlayer().GetName()} might be using a hack! (slot {slotid}, size {loot.items.Count})");
return;
}
loot = pGO.loot;
LootItem item = slotid >= loot.items.Count ? loot.quest_items[slotid - loot.items.Count] : loot.items[slotid];
List<ItemPosCount> dest = new List<ItemPosCount>();
InventoryResult msg = target.CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, item.itemid, item.count);
if (item.follow_loot_rules && !item.AllowedForPlayer(target))
msg = InventoryResult.CantEquipEver;
if (msg != InventoryResult.Ok)
{
if (msg == InventoryResult.ItemMaxCount)
_player.SendLootError(req.Object, ObjectGuid.Empty, LootError.MasterUniqueItem);
else if (msg == InventoryResult.InvFull)
_player.SendLootError(req.Object, ObjectGuid.Empty, LootError.MasterInvFull);
else
_player.SendLootError(req.Object, ObjectGuid.Empty, LootError.MasterOther);
target.SendEquipError(msg, null, null, item.itemid);
return;
}
// now move item from loot to target inventory
Item newitem = target.StoreNewItem(dest, item.itemid, true, item.randomBonusListId, item.GetAllowedLooters(), item.context, item.BonusListIDs);
aeResult.Add(newitem, item.count, loot.loot_type);
// mark as looted
item.count = 0;
item.is_looted = true;
loot.NotifyItemRemoved(slotid);
--loot.unlootedCount;
}
if (loot == null)
return;
if (slotid >= loot.items.Count + loot.quest_items.Count)
foreach (var resultValue in aeResult.GetByOrder())
{
Log.outDebug(LogFilter.Loot, "MasterLootItem: Player {0} might be using a hack! (slot {1}, size {2})",
GetPlayer().GetName(), slotid, loot.items.Count);
return;
target.SendNewItem(resultValue.item, resultValue.count, false, false, true);
target.UpdateCriteria(CriteriaTypes.LootItem, resultValue.item.GetEntry(), resultValue.count);
target.UpdateCriteria(CriteriaTypes.LootType, resultValue.item.GetEntry(), resultValue.count, (ulong)resultValue.lootType);
target.UpdateCriteria(CriteriaTypes.LootEpicItem, resultValue.item.GetEntry(), resultValue.count);
}
LootItem item = slotid >= loot.items.Count ? loot.quest_items[slotid - loot.items.Count] : loot.items[slotid];
List<ItemPosCount> dest = new List<ItemPosCount>();
InventoryResult msg = target.CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, item.itemid, item.count);
if (item.follow_loot_rules && !item.AllowedForPlayer(target))
msg = InventoryResult.CantEquipEver;
if (msg != InventoryResult.Ok)
{
if (msg == InventoryResult.ItemMaxCount)
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.MasterUniqueItem);
else if (msg == InventoryResult.InvFull)
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.MasterInvFull);
else
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.MasterOther);
target.SendEquipError(msg, null, null, item.itemid);
return;
}
// not move item from loot to target inventory
Item newitem = target.StoreNewItem(dest, item.itemid, true, item.randomBonusListId, item.GetAllowedLooters(), item.context, item.BonusListIDs);
target.SendNewItem(newitem, item.count, false, false, true);
target.UpdateCriteria(CriteriaTypes.LootItem, item.itemid, item.count);
target.UpdateCriteria(CriteriaTypes.LootType, item.itemid, item.count, (ulong)loot.loot_type);
target.UpdateCriteria(CriteriaTypes.LootEpicItem, item.itemid, item.count);
// mark as looted
item.count = 0;
item.is_looted = true;
loot.NotifyItemRemoved(slotid);
--loot.unlootedCount;
}
[WorldPacketHandler(ClientOpcodes.SetLootSpecialization)]
Source/Game/Handlers/NPCHandler.cs
+4 -2
View File
@@ -401,9 +401,11 @@ namespace Game
SendPacket(packet);
}
void SendPetStableResult(byte res)
void SendPetStableResult(StableResult result)
{
SendPacket(new PetStableResult(res));
PetStableResult petStableResult = new PetStableResult();
petStableResult.Result = result;
SendPacket(petStableResult);
}
[WorldPacketHandler(ClientOpcodes.RepairItem)]
Source/Game/Handlers/SpellHandler.cs
+1 -1
View File
@@ -422,7 +422,7 @@ namespace Game
if (!pet.IsAlive())
{
pet.SendPetActionFeedback(packet.SpellID, ActionFeedback.PetDead);
pet.SendPetActionFeedback(PetActionFeedback.Dead, 0);
return;
}