Commit Graph

10935 Commits

Author SHA1 Message Date
DDuarte
2ea31027e5 Core: Backport 6.x realm changes
Make acessible all the info about current realm (e.g name) anywhere, not only realm id
Reduce the number of differences between the two branches

Original changes by Shauren

Partial port of bacc90b6ba and 63def8aa32
2016-03-06 19:46:59 +00:00
jackpoz
510bb30b2c Scripts/Misc: Fix issues reported by static analysis 2016-03-06 16:11:55 +01:00
Shauren
7fe5a77f5e Warning fix 2016-03-05 20:17:37 +01:00
Shauren
3d0b065135 Core/Commands: Fixed a crash in .wp mod by @Magnifikator
Closes #16732
2016-03-05 20:16:42 +01:00
Shauren
e73d5a7bf4 Core/Commands: Fixed incorrect use of GetGUID instead of GetSpawnId in waypoint commands
Updates #16732
2016-03-05 20:14:58 +01:00
treeston
49de12b1cf Unit/PlayerAI: Yeah, we allow charmer to be null now, should probably check for that.
Fixes and closes #16728.
2016-03-05 13:29:49 +01:00
sirikfoll
c4e4ee3ae1 Core/Scripts: Fixed Yogg-Saron Portals
Closes #16390
Closes #16708
2016-03-04 20:45:28 +01:00
treeston
f46a0e7eb3 Instance/SunkenTemple: Some cleanup. 2016-03-04 17:52:07 +01:00
MitchesD
e081bc36dc Merge pull request #16720 from tkrokli/npc_thrall_warchief
Core/Scripts: npc_thrall_warchief hardcoded text
2016-03-04 10:49:57 +01:00
durotar
768a5cf354 Scripts/SunkenTemple: Quest 3447 Secret of the Circle Thanks to Tkrokli, Kilyana and Nayd Closes #808
Signed-off-by: MitchesD

Closes https://github.com/TrinityCore/TrinityCore/pull/16367
2016-03-04 00:05:52 +01:00
MitchesD
8e152e0d4a Merge pull request #16523 from tkrokli/smart_action_set_corpse_delay
[3.3.5][6.x]Core/SmartScript: create SMART_ACTION_SET_CORPSE_DELAY
2016-03-03 23:16:59 +01:00
tkrokli
2bbe00e5f4 Core/Scripts: npc_thrall_warchief hardcoded text
7 more text lines removed in the ongoing series:
"Remove hardcoded text from core scripts".

Core script for quest 6566, What The Wind Carries
(part of the Horde Onyxia quest chain)

- create new gossip_menu_option entries
- link the options via the table gossip_menu
- remove hardcoded text from the script
2016-03-03 21:40:39 +01:00
treeston
fe707db96f Core/AI: Fix an edge case crash with PlayerAI. Again. Sheesh. 2016-03-03 20:57:03 +01:00
Naios
62815c6e1c Core/Database: Use RAII for resource management in MySQLConnection
* Prevents double deletion of MySQLConnection after errors
* The object stays valid after an error and will wait for a reconnect
* Also crash the server if 5 reconnects fail
* Corrects an issue where the server was crashed after one reconnect
  because mysql_thread_id was invoked with an invalid handle
2016-03-03 01:19:58 +01:00
Naios
09fa0ab46a Core/Database: Move DatabaseWorkerPool into it's own translation unit 2016-03-03 01:06:13 +01:00
Naios
5ed0180994 Core/Database: Use RAII instead of raw pointers for resource management
* Corrects dirty usage of vectors with array indexes
* Removes _connectionCount which is now handled through the vector size
* Rename magic identifier "t" to "connection"
2016-03-03 01:06:13 +01:00
Naios
7d3cffc297 Core/Database: Close the databases correctly when the DBUpdater fails
* Also fixes a memory leak spotted by Aokromes
2016-03-03 01:06:13 +01:00
Treeston
472e78d682 Merge pull request #16676 from ccrs/summonsinit
Core/TempSummons: avoid use MoveInLineOfSight before InitSummon
2016-03-02 23:54:37 +01:00
ariel-
d573bd2fe7 Core/Conditions: Improved mergeability between branches 2016-03-02 10:57:14 -03:00
ccrs
6a339ed5c9 Core/TempSummons: avoid use MoveInLineOfSight before InitSummon 2016-03-01 21:20:47 +01:00
treeston
89e2afb8f9 Core/Creature: Prevent friendly vehicles from trying to attack their rider after dismounting. 2016-03-01 20:12:46 +01:00
Nyeriah
ecd9dec384 Scripts/Karazhan: Use the correct method to access Opera's side entrance door 2016-03-01 12:38:09 -03:00
tkrokli
c897988a7e Core/Scripts/Zul'Aman: sound handled in creature_text
- Sound playback is handled via creature_text
- remove `DoPlaySoundToSet()` to avoid duplicate playback
- remove redundant 'me' parameter from `Talk()` entries
2016-02-29 19:31:47 +01:00
Aokromes
b646bcbb91 Update boss_nalorakk.cpp 2016-02-29 03:45:14 +01:00
tkrokli
9806f7812a Core/Scripts: Zul'Aman boss script text cleanup
Replacing more hardcoded text with DB entries.
A little bit extra enum alignment and sorting.
2016-02-29 03:16:23 +01:00
Nyeriah
f9eff81388 Scripts/Karazhan: Clean up instance script
Closes: #16533
2016-02-28 11:49:48 -03:00
Aokromes
5accd69863 Merge pull request #16692 from tkrokli/headless_horseman_emote
Core/Scripts/boss_headless_horseman: remove hardcoded text
2016-02-28 13:32:54 +01:00
Aokromes
2387dbdda9 Merge pull request #16699 from tkrokli/triple_zone_cleanup
Core/Scripts: triple zone cleanup
2016-02-28 13:07:43 +01:00
tkrokli
6ffac018dd Core/Scripts: triple zone cleanup
Remove hardcoded (as well as deprecated) text in the following places:
- blackrock_depths.cpp
- zone_burning_steppes.cpp
- zone_stormwind_city.cpp

Updates https://github.com/velinath/TrinityCore/issues/2
2016-02-28 12:25:23 +01:00
treeston
59d02322a7 Unit/AI: Making Nayd happy. 2016-02-28 03:45:21 +01:00
tkrokli
1602be1253 Core/Scripts/boss_headless_horseman: remove hardcoded text
Remove the old
`#define EMOTE_LAUGHS    "Headless Horseman laughs"`

No emote is ever used on retail. It would have created log spam.
2016-02-28 03:23:36 +01:00
treeston
bfac62c5c9 Fix some behavioral weirdness resulting from 79a945d5 - thanks ccrs. 2016-02-28 01:56:13 +01:00
treeston
5354b585e3 Unit/AI: Move CharmedPlayerAI logic from the SetCharmedBy/RemoveCharmedBy hooks to Player::Update -> Unit::UpdateCharmAI to guarantee thread safety and prevent race condition crashes. 2016-02-27 23:48:10 +01:00
joschiwald
ffdf75a233 Scripts/Spells: Glyph of Arcane Shot is affected by own debuffs on target only 2016-02-27 17:55:43 +01:00
joschiwald
75511d0e0a Core/Gossips: fixed long time not seen typo in c81d6e9b4b 2016-02-27 17:32:06 +01:00
Treeston
79a945d5e5 Merge pull request #16666 from Treeston/3.3.5-bodypull
[3.3.5] Fix bosses losing interest in the person running at them
2016-02-27 15:59:43 +01:00
jackpoz
31cd082833 Scripts/Ulduar: Fix crash
Change an assert to a NULL check on Flame Leviathan vehicle kit, it can be NULL on map unload.
Close #16662
2016-02-27 12:02:32 +01:00
Shauren
85c912c404 Core/Misc: Added Convenience methods removing auras by predicate
(cherry picked from commit 0953bcf73f)
2016-02-25 21:01:38 +01:00
treeston
d1a9d7765c Merge remote-tracking branch 'tkrokli/redemption_tirions_tale' into 3.3.5 (PR #16680) 2016-02-25 20:47:54 +01:00
MitchesD
b7e93f68c3 Merge pull request #16671 from tkrokli/zone_terokkar_forest
Core/Scripts: zone_terokkar_forest cleanup
2016-02-25 20:41:39 +01:00
tkrokli
7c9a26c608 Core/Scripts: move npc_tirion_fordring to DB/SAI
This removes the current core script npc_tirion_fordring
and replaces it with database entries in:

- `conditions` 9 (quest taken) + 41 (unit_state)
- `gossip_menu_option` (3502,3681,3682,3683)
- `smart_scripts` (SmartAI)

Gossip text / `npc_text` is already in the database.

Closes  #16430 (my old attempt at removing hardcoded text)
2016-02-25 20:06:16 +01:00
treeston
ea53f79aaf DB/Conditions: Add new CONDITION_STAND_STATE (41). value1 selects the type of state check to apply, value2 specifies the particular state we are looking for.
Valuing: 0,x: has exactly state x; 1,0: any standing state; 1,1: any sitting state;
2016-02-25 19:01:21 +01:00
Aokromes
2eb9621f19 Core/Misc: fix header 2016-02-25 09:34:24 +01:00
Aokromes
b1eff7c1f8 Core/Misc: fix header 2016-02-25 09:33:39 +01:00
Naios
eee75b80ac Core/Scripts: Prepare commands once
* Thanks @joschiwald pointing this out
2016-02-24 23:26:11 +01:00
treeston
d10c698430 build fix 2016-02-24 19:38:14 +01:00
treeston
a8f760b692 Core/PlayerAI: Some more helper methods added. Also, charmed players no longer break crowd control. 2016-02-24 19:35:19 +01:00
treeston
5a3a21c2d0 Core/PlayerAI: More follow-up. Helper functions and some internal cleanup. 2016-02-24 18:21:08 +01:00
treeston
1fbe7979ff Nobody saw that. 2016-02-24 15:47:57 +01:00
Treeston
4e4b2b9a13 Merge pull request #16644 from Treeston/3.3.5-customcharmai
Core/UnitAI: Rework creature-controlled player behavior.
2016-02-24 13:39:31 +01:00