Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,561 Commits 4 Branches 146 Tags
4ae29e38eee94c6dcfee3355cbab7099ffc93bc3
Commit Graph

17504 Commits

Author SHA1 Message Date
ariel-
4ae29e38ee Core/Scripts: fix non-functional Celestial Planetarium Access GO 
- Client only sends CMSG_GAMEOBJ_REPORT_USE for this one

Closes #19982

(cherry picked from commit b490d3f5ad)
 2021-06-19 23:33:24 +02:00
sirikfoll
9573987775 Scripts/Magisters Terrace: Removed not allowed ENSURE_AI call from constructor 
Closes #20727

(cherry picked from commit cfaa4e6caf)
 2021-06-19 23:33:24 +02:00
sirikfoll
e2c72cc02e Scripts/Sunwell Plateau: Fixed and improved spell "Curse of Boundless Agony" target selection (Boss Kalecgos) 
(cherry picked from commit 14b6e3bbb3)
 2021-06-19 23:33:24 +02:00
ariel-
8c379e920c Core/Spells: fix logic error causing near teleports to drop combat for players 
Closes #21362

(cherry picked from commit 65709e1c30)
 2021-06-19 23:33:24 +02:00
ariel-
f9b14ca795 Core/Spells: fix logic error causing near teleports to drop combat for players 
Closes #21362

(cherry picked from commit 65709e1c30)
 2021-06-19 23:33:24 +02:00
ariel-
800d92bec3 Core/Spells: remove duplicated LowerPlayerDamageReq call on reflected spells 
- It is already called at Unit::DealDamage

(cherry picked from commit e979a58d17)
 2021-06-19 23:33:24 +02:00
Treeston
809c38994a Core/Threat: Custom ThreatListIterator that transparently iterates over the backing map (instead of using heap iterators) when working with the unsorted threat list. This greatly reduces the range of actions that can cause iterator invalidation. 
Also some minor adjustments to .debug threat, which no longer hides certain invalid states from view.

(cherry picked from commit 4cb13af4fa)
 2021-06-19 23:33:24 +02:00
ariel-
d34292534c Core/Spells: fix SPELLMOD_DAMAGE application order for melee spells 
Closes #20597

(cherry picked from commit 2d2c43f4b9)
 2021-06-19 23:33:23 +02:00
ariel-
01d9306854 Core/Spells: kill unused parameter from Spell constructor 
Added in 1f2292af79

(cherry picked from commit 9fc732eb97)
 2021-06-19 23:33:23 +02:00
jackpoz
b9159407e0 Core/AI: Fix assertion triggered with PetAI derived scripts (#21254) 
* Core/AI: Fix assertion triggered with PetAI derived scripts

Fix an assertion triggered when spawning through ".npc add" or from SQL db table a Creature with AI set to a custom AI inheriting from PetAI.

(cherry picked from commit 95a76a83fc)
 2021-06-19 23:33:21 +02:00
Treeston
d7542dc3e8 Scripts/Ulduar: Flame Leviathan used a very weird mixture of victim logic and REACT_PASSIVE, which broke during transition to the new system. Replaced with a working version. 
Closes #21265.

(cherry picked from commit b3e0c89238)
 2021-06-19 01:57:55 +02:00
Treeston
7695784fd2 AI/SmartAI: Remove a silly incorrect piece of code that was breaking react state swaps on SAI creatures. Fixes #21353. 
(cherry picked from commit 6e0df9fce1)
 2021-06-19 01:55:18 +02:00
Treeston
a8307e60a3 Scripts/ICC: Valithria Dreamwalker's script no longer despawns unrelated mobs in Frostwing Halls, and thus won't get them stuck in a despawned state due to linked_respawn. 
Closes #21286.

(cherry picked from commit aefc25482f)
 2021-06-19 01:35:41 +02:00
sirikfoll
bd7fbce592 Scripts/Icecrown Citadel: Corrected Val'kyr Shadowguard positioning on heroic mode (Lich King) 
Movement was being prevented by spell cast

(cherry picked from commit a217c0be92)
 2021-06-19 01:35:41 +02:00
Killyana
854abdbfb6 Spell/Script: Torch 52953 and 58121 must hit only one target 
(cherry picked from commit 8f71307e56)
 2021-06-19 01:35:41 +02:00
Treeston
95fb6fe075 Core/Creature: Adjust SelectVictim behavior: (PR #21324) 
- No more automatic combat -> threat promotion. This matches anecdotal retail behavior - spells already in transit will not cause mob to chase you if its primary target vanishes before the spell hits.
- Prevent mobbing by stopping creatures from auto-acquiring a nearby target just because the primary target vanished.

(cherry picked from commit 1acfefb973)
 2021-06-19 01:35:41 +02:00
Treeston
39dff738e1 Scripts/Pets: Mirror Image re-write, because it's a colossal mess right now. (PR #19818) 
(cherry picked from commit 03ef79f3d9)
 2021-06-19 01:35:41 +02:00
Treeston
fdc1c5b6c9 Combat/Threat: Now set engaged state for all units on offline reference registration (vanished/invis'd units). For non-PASSIVE units, this will immediately cause an evade. 
This fixes an exploit where creating the reference as offline (by vanishing while a spell was mid-flight) you could damage a creature further without it ever engaging you.

(cherry picked from commit 2402406228)
 2021-06-19 01:35:40 +02:00
Treeston
75a3b2f122 Game/AI: Remove some unused old logic. 
(cherry picked from commit c69584a967)
 2021-06-19 01:35:40 +02:00
Shauren
428bf60f7f Scripts/Icecrown Citadel: Added missing cosmetic colors and emotes to Big Ooze (Rotface) 
(cherry picked from commit aaab7ba9f4)
 2021-06-19 01:35:40 +02:00
Killyana
2d43b8aaa3 Quest/script: Freedom to Ruul 
Follows 4dc91429dd

(cherry picked from commit 52fc5a572b)
 2021-06-19 01:35:38 +02:00
Killyana
30feaa06e8 DB/Quest: Freedom to Ruul 
Closes #7262

(cherry picked from commit 4dc91429dd)
 2021-06-19 00:14:06 +02:00
Treeston
cb3a041482 Core/Creature: add an assertion to guard against infinite loops 
(cherry picked from commit 320306554c)
 2021-06-18 21:20:41 +02:00
Aokromes
3758fa5862 Core/Misc: Sort string 
(cherry picked from commit 4130647bf6)
 2021-06-18 21:19:07 +02:00
Treeston
7db3f7ca96 DB/SpawnGroup: Instance spawn group data for Tempest Keep: The Eye and Hellfire Citadel: Ramparts. 
(also some minor adjustments to command output for convenience)

(cherry picked from commit 51e28ae76a)
 2021-06-16 23:01:48 +02:00
Treeston
7c0ac5b959 Misc: assert -> ASSERT 
(cherry picked from commit 6c3c200cc5)
 2021-06-16 22:51:16 +02:00
Treeston
386ec58233 Scripts/Commands: new command '.debug instancespawn' 
(cherry picked from commit 6ce078d8e8)
 2021-06-16 22:50:04 +02:00
ariel-
c43f61df3d Core/Spell: killed deprecated code which randomly changed powercost for missed spells 
Added in 80d3cd43f6

Closes #5954

(cherry picked from commit b1072faa50)
 2021-06-16 21:40:33 +02:00
ariel-
570b2b4ce0 Core/Scripts: reverted Auriaya spell script logic 
Thanks Shauren for spotting it

(cherry picked from commit 6dd465c441)
 2021-06-16 21:36:30 +02:00
ariel-
905112b2a6 Core/Player: only call _ApplyWeaponDamage for actual weapons 
Closes #21308

(cherry picked from commit 8e0af1b93b)
 2021-06-16 21:32:53 +02:00
ariel-
d0f4310c44 Core/Entities: don't allow client control if player is still affected by any lose of control state 
(cherry picked from commit e315e41d36)
 2021-06-16 21:26:57 +02:00
ariel-
c77925da4a Core/Entities: killed Creature::SetInCombatWithZone and replaced with AI version 
Closes #12108 (again)

(cherry picked from commit 7c9722a4ae)
 2021-06-16 21:03:06 +02:00
ariel-
29bfa32fc3 Core/Entities: don't allow client control if player is still affected by any lose of control state 
(cherry picked from commit e315e41d36)
 2021-06-16 20:38:56 +02:00
ariel-
b46d899ef1 Core/PlayerAI: perform cast checks on auto ranged attack 
Closes #19928

(cherry picked from commit 590d251882)
 2021-06-16 19:49:57 +02:00
ariel-
df585571f1 Core/Unit: fixed Global cooldown cancelation on spell interrupt 
Thanks to Nyeriah for the heads up

(cherry picked from commit 514c847881)
 2021-06-16 19:43:20 +02:00
ariel-
861cf261c5 Core/Formations: update codestyle and fix crash 
Closes #21288

(cherry picked from commit 73cc613dc8)
 2021-06-16 19:26:32 +02:00
ariel-
0c56ec914f Core/Spells: fix Spirit of Redemption 
- Who would have suspected GetAuraEffect (iconId override) did a check against null spellfamilyflags?
- Remove mirror timers hack (triggered spell already allows underwater breathing)

(cherry picked from commit 4402f71eb7)
 2021-06-16 18:36:21 +02:00
tkrokli
2acaa6fb4a Core/Misc: corrections and indentations in Language.h 
- corrected the comment "1205-2002 - free" to "1205-1999 - free"
- increased the main indent by 2 spaces to get more lines aligned
- corrected the enum LANG_DO_NOT_USE_6X_DEBUG_AREATRIGGER_LEFT from 1999 to 1199

Ref. commit 5f54149107

(cherry picked from commit ba5f6a8616)
 2021-06-16 16:25:40 +02:00
Treeston
14bda72751 Core/Unit: Remove a superfluous threat state update in SetPhaseMask. 
(cherry picked from commit 2c86c78f04)
 2021-06-16 14:37:58 +02:00
Kittnz
cd3425f6a6 Scripts/Outland: Fix logical error in Hellfire event in Honor Hold 
(cherry picked from commit 8f64612cb1)
 2021-06-16 14:32:07 +02:00
Treeston
73bf0e3a0b Core/Threat: Assistance threat (healing, buffs, etc.) is now properly split (instead of copied) between all creatures threatened by the action. Thanks to Foereaper for help with testing, and my apologies to healers everywhere. 
(No apologies for charm AI though. You deserve that one.)

(cherry picked from commit 013d4560c7)
 2021-06-16 14:29:45 +02:00
Treeston
9f91cf23ab Core/Threat: Passive creatures now properly become engaged when adding an offline threat entry. Fixes RoS and Thaddius, maybe more. Closes #21269. 
(cherry picked from commit a373275612)
 2021-06-16 14:26:10 +02:00
ariel-
85ffcd9826 Core/Scripts: fix wrong uses of SetHitDamage hook. 
This hook modifies damage AFTER it has been reduced by target auras/armor/resistances etc, it's useful if you want to scale damage by a factor, but not to add flat bonuses.
We're fixing those by moving calculation to Launch phase, where target taken bonuses haven't been used yet.

- Bronjahm: Magic's Bane
- BPC: Shadow Prison
- Oculus: Shock Lance
- Ymiron: Dark Slash (extra fix, it was wrongly damaging half of total health, it's supposed to be half of CURRENT health!)
- DK: Raise Ally Thrash spell (also extra fix: corrected formula)
- Warrior: Bloodthirst (shouldn't matter much as it's damage class none and those don't get bonuses by default)
- Warrior: Concussion Blow
- Warlock: extra fix for Haunt, healing part shouldn't scale with spell power

Closes #9560

(cherry picked from commit 9f5d1e2b10)
 2021-06-16 14:26:09 +02:00
Keader
18b0135bf7 Scripts/Utgarde Keep: Fixed Ingvar evade in phase 2 (again) 
Closes #21264

(cherry picked from commit 96983fc6bb)
 2021-06-16 12:45:57 +02:00
ariel-
2ef2fee3e7 Core/Auras: fixed EquippedItemClass check 
follow-up to 29c3b7d8f6

(cherry picked from commit f1896144c0)
 2021-06-16 12:45:18 +02:00
ariel-
d0a766f14f Core/Auras: Don't remove shield only dependant auras on disarm 
Closes #19782

(cherry picked from commit b8c281f497)
 2021-06-16 12:34:40 +02:00
ariel-
b27e741096 Core/Auras: define and implement attribute SPELL_ATTR3_NO_PROC_EQUIP_REQUIREMENT 
Closes #20148

(cherry picked from commit 29c3b7d8f6)
 2021-06-16 12:20:14 +02:00
ariel-
62c571076e Core/Scripts: added nullptr checks to DamageTaken hooks 
Since cb9e72e521 attacker may not be in world when hook is called

(cherry picked from commit 0db5c2df3f)
 2021-06-16 12:02:14 +02:00
Treeston
ea79b55698 Scripts/AzjolNerub: Missing nullptr check in Hadronox. Closes #21258. 
(cherry picked from commit d9d26200f7)
 2021-06-16 11:49:03 +02:00
Treeston
6fb45e31c2 DB/SpawnGroup: instance_spawn_group data for map 576 (The Nexus) 
(cherry picked from commit 0319c713a4)
 2021-06-16 11:46:50 +02:00