diff --git a/Source/Game/Chat/Commands/MiscCommands.cs b/Source/Game/Chat/Commands/MiscCommands.cs index c3d5c1800..76152c267 100644 --- a/Source/Game/Chat/Commands/MiscCommands.cs +++ b/Source/Game/Chat/Commands/MiscCommands.cs @@ -1972,10 +1972,7 @@ namespace Game.Chat Player caster = handler.GetSession().GetPlayer(); if (caster != null) - { - ObjectGuid castId = ObjectGuid.Create(HighGuid.Cast, SpellCastSource.Normal, player.GetMapId(), SPELL_UNSTUCK_ID, player.GetMap().GenerateLowGuid(HighGuid.Cast)); - Spell.SendCastResult(caster, spellInfo, new Networking.Packets.SpellCastVisual(SPELL_UNSTUCK_VISUAL, 0), castId, SpellCastResult.CantDoThatRightNow); - } + caster.SendPacket(new DisplayGameError(GameError.ClientLockedOut)); return false; } diff --git a/Source/Game/Handlers/ItemHandler.cs b/Source/Game/Handlers/ItemHandler.cs index 110f5b890..b024304df 100644 --- a/Source/Game/Handlers/ItemHandler.cs +++ b/Source/Game/Handlers/ItemHandler.cs @@ -539,13 +539,15 @@ namespace Game switch (packet.ItemType) { case ItemVendorType.Item: - Item bagItem = GetPlayer().GetItemByGuid(packet.ContainerGUID); - byte bag = ItemConst.NullBag; - if (bagItem != null && bagItem.IsBag()) - bag = bagItem.GetSlot(); - else if (packet.ContainerGUID == GetPlayer().GetGUID()) // The client sends the player guid when trying to store an item in the default backpack + if (packet.ContainerGUID == GetPlayer().GetGUID()) // The client sends the player guid when trying to store an item in the default backpack bag = InventorySlots.Bag0; + else + { + Item bagItem = _player.GetItemByGuid(packet.ContainerGUID); + if (bagItem != null) + bag = bagItem.GetSlot(); + } GetPlayer().BuyItemFromVendorSlot(packet.VendorGUID, packet.Muid, packet.Item.ItemID, (byte)packet.Quantity, bag, (byte)packet.Slot); break; diff --git a/Source/Scripts/Events/Brewfest.cs b/Source/Scripts/Events/Brewfest.cs index c012c2a73..db6e5b439 100644 --- a/Source/Scripts/Events/Brewfest.cs +++ b/Source/Scripts/Events/Brewfest.cs @@ -235,23 +235,6 @@ namespace Scripts.Events.Brewfest } } - [Script] // 43714 - Brewfest - Relay Race - Intro - Force - Player to throw- Dnd - class spell_brewfest_relay_race_intro_force_player_to_throw : SpellScript - { - void HandleForceCast(uint effIndex) - { - PreventHitDefaultEffect(effIndex); - // All this spells trigger a spell that requires reagents; if the - // triggered spell is cast as "triggered", reagents are not consumed - GetHitUnit().CastSpell(null, GetEffectInfo().TriggerSpell, TriggerCastFlags.FullMask & ~TriggerCastFlags.IgnoreReagentCost); - } - - public override void Register() - { - OnEffectHitTarget.Add(new(HandleForceCast, 0, SpellEffectName.ForceCast)); - } - } - [Script] // 43755 - Brewfest - Daily - Relay Race - Player - Increase Mount Duration - Dnd class spell_brewfest_relay_race_turn_in : SpellScript {