Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,420 Commits 4 Branches 146 Tags
7101e33e776eb8ea9ea2f65cf533f09e17374dc1
Commit Graph

33420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ZenoX92
7101e33e77 DB/Creature: Privateer Groy 
Closes #20273

(cherry picked from commit accdbe1806)
 2020-08-23 21:57:39 +02:00
ZenoX92
c4319f6962 DB/Creature: Yarlyn Amberstill 
Closes #20268

(cherry picked from commit e03a6f53f0)
 2020-08-23 21:52:16 +02:00
ZenoX92
d29d8b7597 DB/Creature: Devlin Agamand 
Closes #20266

(cherry picked from commit 4ccc0b66a2)
 2020-08-23 21:13:01 +02:00
ZenoX92
4762ec844e DB/Quest: The Moss-twined Heart 
Closes #20261

(cherry picked from commit 15fefa7a2d)
 2020-08-23 21:09:21 +02:00
ZenoX92
c3ff874271 DB/Creature text: Add missing text to Erich Lohan 
Closes #20259

(cherry picked from commit 12ea2fdaec)
 2020-08-23 21:07:10 +02:00
ZenoX92
e90771b36c DB/Creature: Lizzarik 
Closes #20256

(cherry picked from commit a94d87fb56)
 2020-08-23 21:02:18 +02:00
ZenoX92
77b6191d6b DB/Creature text: Cerellean Whiteclaw Fix incorrect text type 
Closes #20255

(cherry picked from commit 731b1d2120)
 2020-08-23 19:33:06 +02:00
ZenoX92
785182dd53 DB/Creature: Tavernkeep Smitts 
Closes #20254

(cherry picked from commit 63f050ea96)
 2020-08-23 19:11:56 +02:00
ZenoX92
82badd3587 DB/Creature: Shellene 
Closes #20253

(cherry picked from commit d6bc36840a)
 2020-08-23 19:08:13 +02:00
ZenoX92
513f1ba818 DB/Creature text: Infiltrator Marksen BroadcastText correction 
Closes #20252

(cherry picked from commit d8f3fa7179)
 2020-08-23 19:06:33 +02:00
ZenoX92
b1498a7a1c DB/Creature: Viktori Prism'Antras 
Closes #20251

(cherry picked from commit db6073374f)
 2020-08-23 19:05:41 +02:00
Treeston
4a909ada55 Scripts/Naxxramas: Missing nullptr check in Patchwerk. Closes #20247. 
(cherry picked from commit c9ac68d6e3)
 2020-08-23 19:02:57 +02:00
Treeston
fc12e47cb8 Core/Player: Prevent changing equipment while charmed. Closes #20209. 
(cherry picked from commit a1a12ec755)
 2020-08-23 19:02:30 +02:00
Aokromes
eccaf847c5 DB/Creature: Restore 2 creatures deleted on previous commit 
(cherry picked from commit 310cc50cd1)
 2020-08-23 19:01:46 +02:00
Keader
b3c6330a6e Core/Scripts: Auriaya rewrite (#20204) 
(cherry picked from commit f67c6a5a12)
 2020-08-23 18:59:36 +02:00
ccrs
debe97b77a Core/Movement: minor correction on WaypointMovementGenerator 
remove the CanMove check since it will never trigger
the timer is left there to prevent errors on loading such as leader being created before the other members of the formation making them skip the first movement; purely a workaround

(cherry picked from commit c7d565739b)
 2020-08-23 18:46:49 +02:00
Killyana
f27450d0e8 DB: Add missing spawns to Mord'rethar: The Death Gate 
(cherry picked from commit 4aceb7bf91)
 2020-08-23 18:46:25 +02:00
Keader
68992bcd0d Core/Scripts: Removed wrong AddThreat call in Pursuit spellscript 
followup 52ad0c9e5c
checked in sniffs, only ick add threat in target, wrong call in original script (why o keep it? o.o)

(cherry picked from commit f86b4e45e5)
 2020-08-23 18:39:49 +02:00
ZenoX92
d716f3e5b5 DB/Creature: Madame Eva 
Closes #20219

(cherry picked from commit 7a62c71a46)
 2020-08-23 18:39:08 +02:00
ZenoX92
226cb4b8a1 DB/Creature: Hogan Ference 
Closes #20217

(cherry picked from commit 8aaf1405fc)
 2020-08-23 18:38:03 +02:00
ZenoX92
eab37a464f DB/Creature: Councilman Millstipe 
Closes  #20216

(cherry picked from commit 1e32ae578c)
 2020-08-23 18:36:37 +02:00
ZenoX92
fe310c64f2 DB/Creature: Lord Ello Ebonlocke 
Closes #20215

(cherry picked from commit 49e6b1f6df)
 2020-08-23 18:35:23 +02:00
ZenoX92
f06d08122a DB/Creature: Althea Ebonlocke 
Closes #20214

(cherry picked from commit 8aac8003f1)
 2020-08-23 18:28:22 +02:00
ccrs
c065c5c774 Core: fix noPCH build v2.0 
(cherry picked from commit 5f370a035c)
 2020-08-23 18:02:32 +02:00
Carbenium
4e44bc6ea2 Core: Fix non-PCH build 
(cherry picked from commit 45cb8c90e9)
 2020-08-23 17:57:07 +02:00
Dr-J
1b2dae376b DB/Misc: Kirin Tor Spirits force reaction 
Abjurist Belmara, Cohlien Frostweaver, Conjurer Luminrath and Battle-Mage Dathric each should become neutral to players once there associated quest is rewarded

(cherry picked from commit 420732e961)
 2020-08-23 17:55:57 +02:00
Keader
d0a655de12 Core/Scripts: Typo fix 
(cherry picked from commit 72aa03441f)
 2020-08-23 17:49:42 +02:00
Keader
0537f3bd58 Core/Script: Krick and Ick, fixed spell Pursuit 
Close #2261

(cherry picked from commit 52ad0c9e5c)
 2020-08-23 17:48:07 +02:00
Treeston
06a1271a50 Core/Misc: random refactors 
(cherry picked from commit 37dff2b7a1)
 2020-08-23 17:47:41 +02:00
Treeston
27806eeac9 Core/Spawn: Move spawn group state management from sObjectMgr to the Map object, which makes it actually function as intended with instances. Woops. 
(cherry picked from commit f279207d48)
 2020-08-23 17:00:59 +02:00
ccrs
5d61618955 Scripts/AzjolNerub: minor corrections 
ref #19072

(cherry picked from commit 80a8867332)
 2020-08-23 16:25:25 +02:00
Treeston
67abc694e3 Scripts/AzjolNerub: Fix some duplicate summons after JustAppeared changes. Closes #20183. 
(cherry picked from commit dcc3cd21e8)
 2020-08-23 16:07:46 +02:00
Yehonal
ae4dacfd1d Core/Scripts: FOR_SCRIPTS macro shouldn't return early (#20187) 
FOR_SCRIPTS, insteadof FOR_SCRIPTS_RET, shouldn't return
otherwise methods such as void ScriptMgr::OnPlayerEnterMap(Map* map, Player* player) will end prematurely

(cherry picked from commit 4ee16fb536)
 2020-08-23 16:06:43 +02:00
Killyana
d361de0c27 DB/Creature: Fix Risen Archmage positions on Valithria 25 modes 
(cherry picked from commit e56c4f40d4)
 2020-08-23 16:06:16 +02:00
Treeston
f97b601d93 Core/Creature: Fix an oversight in Creature::SelectVictim that was causing creatures to evade when chased by another creature from outside their own aggro range. Closes #19998. 
(cherry picked from commit 1f57d1ac67)
 2020-08-23 16:01:13 +02:00
ZenoX92
ddf45f44d3 DB/Creature: Tosamina 
Closes #20176

(cherry picked from commit 6621d8fd7b)
 2020-08-23 16:00:51 +02:00
ccrs
9a5e2b80b3 Core/Creature: regenerate health 
There are three possible scenarios regarding regenerating health
- db lock and curhealth set to > 0
- db lock and curhealth set to 0
- dynamic lock (set in scripts and such) overriding db lock

(cherry picked from commit 91c0d49c18)
 2020-08-23 15:56:21 +02:00
ZenoX92
04c974dbc3 DB/Creature: Lil Timmy 
Closes #20175

(cherry picked from commit 5f8ee9a01e)
 2020-08-23 15:28:07 +02:00
ZenoX92
dea04f8649 DB/Creature: Zem Leeward 
Closes #20174

(cherry picked from commit d3ba34fdeb)
 2020-08-23 15:02:22 +02:00
Treeston
22b754c9e2 Core/Creature: temporary summons are now dynamic flagged (oversight in dynspawn). This fixes issues with vehicle kit resets breaking AI. 
Closes #20137 #20138 #20153.

(cherry picked from commit 92e9376e5e)
 2020-08-23 14:52:51 +02:00
Treeston
2924ae0803 Scripts/Commands: .npc delete and .gobj delete now work while the specified guid is despawned. Fixes #20145. 
(cherry picked from commit cac99beffd)
 2020-08-23 14:47:48 +02:00
Treeston
88a61fa9d6 Scripts/Auchindoun: Fix a super edge case crash bug with GM far teleports during Blackheart's charm phase. Follow-up to d80d7c6. 
(cherry picked from commit 165bc02889)
 2020-08-23 14:47:29 +02:00
Keader
43f76c8cdd Core/Scripts: Updated Razorscale to new registers model 
* More codestyle fixes
* Ty sirikfoll :)

(cherry picked from commit 76fc9ed635)
 2020-08-23 14:44:29 +02:00
Keader
3df7e8b9fb Core/Razorscale: Codestyle Updates 
* Removing spelldifficulty_dbc to make portable to master
* Updated to new Spell/Aurascript model

(cherry picked from commit 203c5f7058)
 2020-08-23 14:39:20 +02:00
Foereaper
07e903a23d Scripts/Naxxramas: Fix Heigan the Unclean eruption event (#20129) 
By scheduling the eruption event without cancelling the previously registered eruption events, Heigan's eruption (or dance) would overlap and cause a runaway scenario, where eruptions would not follow a proper timer.

By using Reschedule and not locking the Eruption event to the fighting phase, the dance now works as intended.

(cherry picked from commit 6f4492bc61)
 2020-08-23 14:35:07 +02:00
Killyana
3fcb592568 DB: Add missing spawns in Wintergarde Mausoleum 
(cherry picked from commit c702a1e250)
 2020-08-23 14:21:30 +02:00
Gustavo
e5963fda0e Core/Scripts: More fixes in boss Lich King (#20147) 
* Core/Scripts: More fixes in boss Lich King

Fix Valkyr charge spell, they will no longer ignore Z position and become unreachable.
Correct height of Spirit Bomb and added the 3 seconds delay on his explosion.
Set the Trigger inside frostmourne room as active, to avoid problems with reseting the room, e.g: Spirit Bombs not despawning and Wicked Spirits stuck in evade.
Use correct InhabitType for Wicked and Vile Spirits, this avoid a situation where they could spawn falling.

(cherry picked from commit 22a7956069)
 2020-08-23 01:20:27 +02:00
Demonid
fa762826e9 Scripts/Icecrown Citadel: Fixed Lord Marrowgar - Coldflame to not ignore resistances (#20146) 
Closes #13240

(cherry picked from commit 7b747848ed)
 2020-08-23 01:16:17 +02:00
ccrs
5e39572c06 Core/Movement: 7fff83d675 followup 
since MOTION_SLOT_IDLE cannot be expired, signal path done and behave like IdleMotionGenerator

(cherry picked from commit eb2769996f)
 2020-08-23 00:52:05 +02:00
ccrs
138edeb34e Core/AI: add missing checks on AssistPlayerInCombatAgainst 
(cherry picked from commit ee5cbf28bc)
 2020-08-23 00:49:53 +02:00