araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-17 13:39:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
36,555 Commits 17 Branches 140 Tags
fc6dc06513da4449fade9655da5d0db942fb132e
Commit Graph

26327 Commits

Author SHA1 Message Date
ccrs fc6dc06513 Build: fix error 
/var/lib/jenkins/jobs/tc_335_release_clang40_boost_1.63.0_nopch/workspace/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp:583:132: warning: format specifies type 'unsigned int' but the argument has type 'float' [-Wformat]
                TC_LOG_TRACE("scripts.cos", "npc_arthas_stratholmeAI::AdvanceToState: has snapback for this state, distance = %u", target.SnapbackPosition->GetExactDist(me));
                                                                                                                              ~~   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                                                                              %f
/var/lib/jenkins/jobs/tc_335_release_clang40_boost_1.63.0_nopch/workspace/src/common/Logging/Log.h:176:56: note: expanded from macro 'TC_LOG_TRACE'
    TC_LOG_MESSAGE_BODY(filterType__, LOG_LEVEL_TRACE, __VA_ARGS__)
                                                       ^~~~~~~~~~~
/var/lib/jenkins/jobs/tc_335_release_clang40_boost_1.63.0_nopch/workspace/src/common/Logging/Log.h:159:32: note: expanded from macro 'TC_LOG_MESSAGE_BODY'
                    check_args(__VA_ARGS__);                            \
                               ^~~~~~~~~~~

(cherry picked from commit 303811399f)
 2021-12-13 00:42:18 +01:00
ccrs 70fd6e7398 Core/Instances: improve DoRemoveAurasDueToSpellOnPlayers & DoCastSpellOnPlayers handling 
(cherry picked from commit 22b3b21ae3)
 2021-12-13 00:42:18 +01:00
ccrs cadbf42ea4 Misc: some corrections after recent merges 
(cherry picked from commit 626a24822b)
 2021-12-13 00:42:18 +01:00
Sorikoff 996b7c1f0e Scripts/Spells: Ultrasafe Transporter: Toshley's Station (#23537) 
* Scripts/Spells: Ultrasafe Transporter: Toshley's Station

* Rename 9999_99_99_99_world.sql to 2019_06_29_01_world.sql

(cherry picked from commit 33b4ad5a89)
 2021-12-13 00:42:18 +01:00
Sorikoff 7b08125c23 Scripts/Spells: Remove Collapsing Cave Aura (#23533) 
* Scripts/Spells: Remove Collapsing Cave Aura

* Rename 9999_99_99_99_world.sql to 2019_06_29_00_world.sql

(cherry picked from commit 8d1a5fa126)
 2021-12-13 00:42:18 +01:00
Wyrserth 5ca9f51033 Core/Loot: fix issue that prevented players from rolling for an unique-category item while an equipped item shares the same unique-category. 
(cherry picked from commit eb7a6391aa)
 2021-12-13 00:42:18 +01:00
jackpoz 841630fcc3 Core/Misc: Fix static analysis issues reported by Coverity Scan 
(cherry picked from commit de88691e25)
 2021-12-13 00:42:18 +01:00
Sorikoff 88457030cc Scripts/Spells: Deathbolt (#23531) 
* Scripts/Spells: Deathbolt

* Rename 9999_99_99_99_world.sql to 2019_06_28_01_world.sql

(cherry picked from commit 62b2c379b3)
 2021-12-13 00:42:18 +01:00
Sorikoff ea4c1ae7d0 Scripts/Spells: Dimensional Ripper - Area 52 (#23505) 
* Scripts/Spells: Dimensional Ripper - Area 52

* Rename 9999_99_99_99_world.sql to 2019_06_28_00_world.sql

(cherry picked from commit 63f548921c)
 2021-12-13 00:42:18 +01:00
Wyrserth 2fea2a1e81 Core/GameObject: do not allow consumable chests to restock while partially looted. 
(cherry picked from commit cd73664f53)
 2021-12-13 00:42:18 +01:00
Wyrserth f136d3cfe0 Core/GameObject: fix some cases where summoned gameobjects of a type different than chest or goober would behave wrongly. 
(cherry picked from commit 9f0ac0c243)
 2021-12-13 00:42:18 +01:00
Wyrserth 575f42089e Core/Spell: fix some issues with taunt spells (#23425) 
(cherry picked from commit 5dc2dfd60c)
 2021-12-13 00:42:18 +01:00
Wyrserth 9d40a105e6 Core/Mail: include 100g in the mail sent after turning in the quest The Wrath of Neptulon (#23500) 
(cherry picked from commit cf223370f3)
 2021-12-13 00:42:18 +01:00
Wyrserth 5c5bcba65a Script/ZulGurub: rewrite High Priest Thekal's encounter script (#23429) 
(cherry picked from commit 365e2f191e)
 2021-12-13 00:42:18 +01:00
Wyrserth c637260a37 Core/GameObject: implement restock mechanic for non-consumable gameobjects (#23526) 
(cherry picked from commit e77c2d55c4)
 2021-12-13 00:42:17 +01:00
Wyrserth d197a7ce9b Core/SAI: add param3 to SMART_ACTION_CALL_TIMED_ACTIONLIST to allow it to override a currently running actionlist. 
(cherry picked from commit eeba12778b)
 2021-12-13 00:42:17 +01:00
Wyrserth 7c7bb95da5 Core/GameObject: restore old behavior for non-consumable chests with restock timer (make them despawn). 
(cherry picked from commit 50c5d30d13)
 2021-12-13 00:42:17 +01:00
Wyrserth 836a1bc622 Core/GameObject: don't allow non-consumable goobers to despawn on use (#23469) 
Closes #15730.

(cherry picked from commit 2b1e8d135b)
 2021-12-13 00:42:17 +01:00
Wyrserth 09e849bb69 Core/Spell: allow damage from binary spells to go through elemental resistance's damage reduction. (#23479) 
(cherry picked from commit efc999227d)
 2021-12-13 00:42:17 +01:00
Wyrserth 83a9222c39 Core/SAI: allow creatures to handle gameobject spellhit SAI events. (#23492) 
(cherry picked from commit 7a71127da9)
 2021-12-13 00:42:17 +01:00
Wyrserth 62f5d9b46b Core/SAI: do not pass old creatureData to UpdateEntry() and keep current health when changing a NPC's entry. (#23493) 
(cherry picked from commit 8967cc96df)
 2021-12-13 00:42:17 +01:00
Keader adc16ffbdc Script/FoS: prevent Wailing Souls from becoming desynched in the Devourer of Souls encounter. 
(cherry picked from commit 079b77b5fc)
 2021-12-13 00:42:17 +01:00
Wyrserth 902a6f17dc Script/CoS: fix DB error and remove wrong on-death text for Chrono-Lord Epoch. 
(cherry picked from commit 22b222b44e)
 2021-12-13 00:42:17 +01:00
Aokromes 30cec73c61 Coding standards (#23514) 
* Coding standards

* revert part

(cherry picked from commit fe744977c9)
 2021-12-13 00:42:17 +01:00
Treeston c9d52c9547 Core/AI: Actually accurately reproduce the logic from before 8499434 that determines what summons start following on appearance. Third time's the charm? 
Closes #23513.

(cherry picked from commit 3cdf27494f)
(cherry picked from commit 63383da36e)
 2021-12-13 00:42:16 +01:00
ccrs eda6e5c316 Script/CoS: full instance rewrite (#23388) 
(cherry picked from commit ca62280675)
 2021-12-13 00:42:16 +01:00
Wyrserth e8c1adcf8f Core/SAI: silence wrong SAI error when using SMART_ACTION_SET_DATA on a creature using CreatureAI. 
This behavior is fully allowed and should not report any kind of error.

(cherry picked from commit c95531595e)
 2021-12-13 00:42:16 +01:00
Shauren 54f607641a Core/Spells: Moved SpellVisual functions from Unit to WorldObject 2021-12-12 19:34:00 +01:00
Shauren f61de627e5 Core/Commands: Fixed crash in .npc showloot 2021-12-12 19:19:29 +01:00
Shauren 9951b53808 Core/Misc: Fixed some gcc warnings 2021-12-12 19:19:15 +01:00
Meji 1a84641549 Core/BattlePets: Added default cooldown to revive battle pets (#27383) 
* Added SpellHistory function to retrieve remaining category cooldown
* Changed SpellHistory::ModifySpellCooldown to allow adjusting only regular spell cooldown without touching category
 2021-12-12 18:35:15 +01:00
Shauren 1c00109756 Core/Creatures: Fixed crash in CreatureAI::JustAppeared caused by scripted summons without SummonProperties 
Closes #23507

(cherry picked from commit c0b25c9a83)
 2021-12-12 02:20:42 +01:00
ccrs 4747debed1 Core/Player: 72fc79a followup 
safer approach, please report any returning issue

(cherry picked from commit 337de2b61e)
 2021-12-12 02:16:42 +01:00
ccrs a4da12119e Scripts/Misc: couple corrections to the recent PRs 
(cherry picked from commit 4a8736b829)
 2021-12-12 02:16:01 +01:00
ccrs f4a71ea9aa Core/AI: remove extra empty line 
(cherry picked from commit 3c77c04b05)
 2021-12-12 02:15:10 +01:00
ccrs d7e544e816 Core/AI: minimize further undesired behaviours (e3e4b97 followup) 
Those Category checks come from checking all Spell::SummonGuardian uses

(cherry picked from commit ebd438883e)
 2021-12-12 02:15:00 +01:00
Treeston 007eb8c931 AI/TotemAI: Tell Shaman Totems to stay put and stop moving. Closes #23498. 
(cherry picked from commit e3e4b975ce)
 2021-12-12 02:13:19 +01:00
Treeston 743d022cee AI/SmartAI: Properly forward to inherited CreatureAI::JustAppeared in SmartAI::JustAppeared. Fixes #23491. 
(cherry picked from commit 854a113fc7)
 2021-12-12 02:11:15 +01:00
Treeston 38d7c1530a Combat/Threat: Split ThreatManager::NotifyDisengaged off from ThreatManager::ClearAllThreat. NotifyDisengaged signifies intent to clear the engagement flag, and should only be called from AI. Fixes #23490. 
(cherry picked from commit 1158f267df)
 2021-12-12 02:09:15 +01:00
Treeston e398bb1664 AI/SmartAI: Move SMART_EVENT_RESPAWN invocation from ::InitializeAI() to ::JustAppeared(). Closes #23313. 
(cherry picked from commit 37fc38b917)
 2021-12-12 01:27:04 +01:00
Treeston 9f7d3ebd6a Core/AI: Remove EnterEvadeMode calls from Guardian/Summon spell handlers. Add follow logic to CreatureAI::JustAppeared. Closes #23270. 
(cherry picked from commit 8499434340)
 2021-12-12 01:27:04 +01:00
Treeston f9b8fe686d Entities/Unit: Adjust an overzealous assert to not catch self references, and add the inverse assert too. 396f87c follow-up. 
(cherry picked from commit aeed616c22)
 2021-12-12 01:27:04 +01:00
Treeston d10554da14 Entities/Unit: Fix an issue where Unit pointers could be left dangling if a channeled Charm was interrupted by a control aura application. Closes #23440. 
(cherry picked from commit f4b06fd0b7)
 2021-12-12 01:27:04 +01:00
Treeston edc7583119 Entities/Unit: Cleanup all the direct accesses to m_unitMovedByMe. Refactor the field to be protected. Add assertions to catch dangling pointers. 
(cherry picked from commit 396f87c30d)
 2021-12-12 01:26:41 +01:00
Treeston 06823f19cd Core/Misc: Add static versions of GetGUID and ToX methods to Object. The static versions return Empty/nullptr for null objects. 
(cherry picked from commit b3ee407707)
 2021-12-12 00:46:03 +01:00
Treeston f29644efd5 some more cleanup, a5f8c0d follow-up 
(cherry picked from commit 00728cef15)
 2021-12-12 00:33:36 +01:00
Treeston e3411b4740 Core/Creature: Attach out-of-combat health regen to the Engaged system, not the Combat flag. Closes #21571. 
(cherry picked from commit a5f8c0d30c)
 2021-12-12 00:33:23 +01:00
Treeston dabdad3b47 Core/Misc: Rename Unit::AttackedTarget to Unit::AtTargetAttacked to match naming scheme for these notifiers 
(cherry picked from commit 632a300dd2)
 2021-12-12 00:33:18 +01:00
Treeston 35e55f1089 Core/Entities: Kick engagement logic upstairs to Unit (from ThreatManager), since all Units with AI need it (not just those with threat list). Fixes #17981. 
(cherry picked from commit dbe3bbefe7)
 2021-12-12 00:31:15 +01:00
jackpoz dd22c6fe67 Core/Misc: Code cleanup 
(cherry picked from commit eeced9ae15)
 2021-12-11 23:20:05 +01:00