Commit Graph
22569 Commits
Author SHA1 Message Date
treeston 20ef64c8d8 AI/PlayerAI: Fix potential edge case crash.
(cherry picked from commit 2d2544fab025689912bc94d39b41bd86540ec1be)
2017-01-12 00:02:30 +01:00
Trisjdc 781c5a3b82 Core/Creatures: Remove resetting of UNIT_FLAG_IMMUNE_TO_PC on combat clearing
(cherry picked from commit 34ef05ce0bfa34855ce33fcdf2bf82d257ae6672)
2017-01-12 00:02:30 +01:00
Keader 6ca75ef039 Core/Scripts Improve Felflame Infernal of Lord Jaraxxus fight (#16998)
(cherry picked from commit 43855b47d8f436bbf6dc5437446490bb02ea3a01)

Rename 9999_99_99_world.sql to 2016_06_02_01_world.sql
(cherry picked from commit 7f0e1caf72acb44a738b89037bf4f2555c4ca023)
2017-01-12 00:02:29 +01:00
Keader 7f2b5f3859 Core/Scripts Improve Jormungars fight
(cherry picked from commit 0912df258d722f867c8ebe8fc77310f4fd1ce38c)

Rename spell_snakes_spray for spell_jormungars_snakes_spray and cleanup
(cherry picked from commit 2c9c8afc0f23dada7599ecede4bf3d598ab42006)

Fixing the issue
(cherry picked from commit 81083a8593b846e5a64f59771c4446f9f29c34c3)

Changing remove aura method
(cherry picked from commit b88d49be2498ce484124c1adc2bc1ab5ac2aa176)

changing creature_text (tk feedback)
(cherry picked from commit 9b444877dd8955ee0cfcf9bf56304220c4c276fb)

Override and tkrokli again :D
(cherry picked from commit 7205b4dd65bd569e4b254586f6802199de447194)

Fix SQL name
(cherry picked from commit cae19692ab2b627b292cdeed59069d5f6fa3be30)
2017-01-12 00:02:29 +01:00
Snapper fbb9fc0228 Core/SmartAI: remove unneeded check for SMART_ACTION_FORCE_DESPAWN.
Gameobjects do not need to use SmartAI in order to be targeted by other entities' scripts.

(cherry picked from commit 9803e58392eea0828aac96cd79a794a77323d9d0)
2017-01-12 00:02:29 +01:00
Shauren fcabeed754 Core/DBLayer: Added new async query callback api 2017-01-11 23:45:03 +01:00
treeston 2b3cf3d480 AI/PlayerAI: Code style cleanup.
(cherry picked from commit e3aa19281f4d1e2437a5654715f75ae919bd4027)

Build fix for horrendous, outdated, non-standards-compliant compilers. Such as the one in VS 2013. I hate VS 2013.

Closes #17260.
(cherry picked from commit 321d35417d39bd2531c63c63cd432cf86d84453f)
2017-01-11 23:24:42 +01:00
treeston & Keader 0897042998 AI/PlayerAI: Finally implement cast logic for controlled players.
(cherry picked from commit 25c5570f4714a8e26f4f1c5e61a1dab7767c8fbc)
2017-01-11 22:41:30 +01:00
DDuarte 237e291c3f Core/World: Remove unused config CONFIG_SIGHT_GUARDER
(cherry picked from commit ca231cba0bb08f6fcf3747d634543c4c3264ca94)
2017-01-11 21:44:33 +01:00
Aokromes 940c522222 Update zone_hinterlands.cpp 2017-01-11 02:14:23 +01:00
Aokromes b3f2dd6807 Script/Taxi Sharpbeak Hinterlands
By Malcrom
2017-01-11 02:10:33 +01:00
Shauren d2c77d823d Core/Groups: Send PartyUpdate to all players leaving group, not only on disband
Closes #18757
2017-01-10 20:19:27 +01:00
joschiwald e9af56c4a4 Fixed warning 2017-01-10 03:13:13 +01:00
DDuarte 0c511397a4 Revert "Merge pull request #16433 from Tonghost/3.3.5"
This reverts commit e3d52990dd1e543baea6fed0c7e99359263e6452, reversing
changes made to 6d8e39f59c80639de3681565f55d68d452223c87.

Opens #16759

(cherry picked from commit 5aae01986f506b160dbd5dc08aa7e6f3fec72342)
2017-01-09 21:50:49 +01:00
SnapperRy 6444bb9a14 Core/Quests: Remove wrong call to SendQuestComplete(). (#17200)
(cherry picked from commit 9480a210f24a1ebe006b065d7972512882cf3c5a)
2017-01-09 21:40:06 +01:00
sirikfoll 04ff2e195f Core/Achievement A-bomb-inable and A-bomb-ination
(cherry picked from commit e016bf8d06c8236c160ecaf63c6a4f26f7d4467b)

DB: SQL rename
(cherry picked from commit 71081c2576571a6e6d5a16179e6729843094a882)
2017-01-09 21:36:03 +01:00
sirikfoll 31e08b9722 Core/Unit Do not allow addition of threat to units in evade mode
(cherry picked from commit 7d769006aa1e014d6f01ef4c7fa450e827fc32fc)
2017-01-09 21:33:32 +01:00
Shauren dad19df69d Core/Units: Renamed and documented UNIT_FLAG_DISABLE_MOVE to prevent people from trying to use this flag to root a creature leaving them wondering why it doesn't do anything
(cherry picked from commit b36da771857554c5bd652bf8ccc1386d4be607b0)

Core/Scripts: build fix

(cherry picked from commit 258368a2bd0e7c2d395d98dc3220d8e32e65303f)
2017-01-09 21:16:36 +01:00
Shocker 0cddecf2d4 Merge pull request #17138 from ForesterDev/creature_family
Core/Misc: Define CREATURE_FAMILY_NONE to avoid magic numbers in code
(cherry picked from commit 62635f07d0838ac94c2d1329849e1825406eaaff)
2017-01-09 20:52:48 +01:00
Shauren b999d8c5ac Core/Loot: Fixed resaving looted items from containers
Closes #15299

(cherry picked from commit 4a074ca4708580e6fe208b1f9979fb1e17f66b47)
2017-01-09 02:10:28 +01:00
Shauren 6393e80129 Core/Spells: Implemented SPELL_ATTR1_DISMISS_PET
Closes #7372

(cherry picked from commit 9246189b9849349b63bc89663407199fb96b4bbc)
2017-01-09 02:10:08 +01:00
Golrag e9e3daa30c Core/Object: Use object edges to calculate LoS
(cherry picked from commit da6065db00768735e70cd0a81af7f5ec4c2f0414)
2017-01-09 02:07:42 +01:00
ForesterDev 5c2705fadc Core: updated creature type flags enum (#17128)
Core/Misc: Update CreatureTypeFlags enum according to TrinityCoreWiki
(cherry picked from commit fb0881398a106806fad48abe9ffd600e0caf175d)

# Conflicts:
#	src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
#	src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Miscellaneous/SharedDefines.h
2017-01-09 02:00:17 +01:00
treeston dfaf4542e6 Conditions/ConditionMgr: Add a comment so MitchesD can go away.
(cherry picked from commit 759aae56ad5e51e24ff6127fa655d8294c7de059)
2017-01-09 02:00:10 +01:00
Shauren 8045907c14 Core/Chat: Don't check item suffix name when validating item links when the item has ITEM_FLAG3_HIDE_NAME_SUFFIX 2017-01-08 23:28:00 +01:00
Shauren 4799e5841d Core/Auras: Fixed cooldowns for procs calling PreventDefaultAction() in aura proc script
* This also fixes proc cooldows unneccessarily being sent to client
* Also removes the need for cooldown hacks when the proc trigger is selected randomly like for Deathbringer's Will

(cherry picked from commit 1e1fcd6847619629f4b6642faaccb81c4cf3755e)
2017-01-08 23:24:51 +01:00
mik1893 5a93f2b974 Core/Spells: Proc handler script converions (#17122)
* Blazing Speed (Mage)
* Blessed Recovery (Priest)
* Druid Forms Trinket
* Idol Of Mutilation
* Nature's Guardian (Shaman)
* Nether Protection (Warlock)
* Piercing Shots and Bonus 4P T9 Hunter
* Lightning Shield (Shaman)
* Acclimation (DK)
* Move DK T10 4P Melee Bonus
* Move DK Improved Blood Presence triggered heal (DK)
* Rogue T10 2P Bonus
* Illumination (Paladin)
* Soul Preserver
* Death Choice trinket
* stack trinket scripts (ToC25 Caster Trinket, Lightning Capacitor, Thunder Capacitor)
* Battle Experience (ICC - Gunship)
* Blood Reserve (enchant proc)
* Darkmoon Card Greatness
* Charm of the Amani Witch Doctor
* Mana Drain

(cherry picked from commit 5b8e68ee6335ecbc9fea253eaceecb20c50aa41e)
2017-01-08 22:37:18 +01:00
Alan Deutscher 1c60553df0 Core/Spells Make certain spells (e.g. Mind Control) properly flag the caster for PvP (#17145)
* This issue was caused by PvP-flagging being done calculated after the target's flag was turned off by becoming a pet.

(cherry picked from commit e7a12edb833ffe26f27d6e392e97a560ffb0c827)
2017-01-08 19:41:37 +01:00
vincent-michael a2ee7e16ec Core/Quests: Fixed issue reported by static analysis
Coverity defect ID: 1355241

(cherry picked from commit a01fd522675701f5dd2d30684b1689c9f8432d75)
2017-01-08 19:35:02 +01:00
mik1893 4c60bbea0e Core/Unit: Pet shouldn't be notified for DOT damage on the owner (#17133)
- Fix by @MrSmite
- Closes #16894
(cherry picked from commit 4de1426d080084667da83a60857ee9c0492086fd)
2017-01-08 19:32:51 +01:00
treeston ae11329e71 Add a LOG_WARN when attempting to summon a non-existing summon group.
(cherry picked from commit 4d4d2f56651b9d9a3966ec2d39f8af182660b369)

Seriously, who doesn't support std::string instead of char* in 2016?
(cherry picked from commit a012b37d66cdfcd3a8f6485c8563740f6f174823)
2017-01-08 18:12:33 +01:00
Nawuko 955bfae5ef Core/Movement: Fix issues where creatures cancel spell casts chasing target and Implement SPELL_ATTR5_CAN_CHANNEL_WHEN_MOVING
(cherry picked from commit bf2cee8cce39e64590dc68bc35e5d3d2dd19cbaf)
2017-01-08 18:06:43 +01:00
treeston 86aa3997e4 Allow BossAI::_DespawnAtEvade to work on creatures other than the boss itself (optional argument).
(cherry picked from commit 6040e30fa381efdfc466d635bc6fe150d878e5ed)
2017-01-08 17:31:42 +01:00
treeston bef9683a30 Core/Scripts: Added reasonable default params to GetCreatureListWithEntryInGrid/GetGameObjectListWithEntryInGrid for ease of use. Also, entry = 0 means no filter now, since we lacked an easy way to get a list of all creatures in grid.
(cherry picked from commit 0d5adf356ebaf57507c2a937e47db5e6b97c3e22)
2017-01-08 16:56:21 +01:00
treeston 233c3a3845 Core/AI: Add DoCastSelf helper.
(I have no idea why I never bothered to do this before, really. It had crossed my mind a few times.)

(cherry picked from commit ab0abdbde5fb70a88aba4ec05291ec717444abe8)

This discussion is more effort than it takes to change it.
(cherry picked from commit b52a6b857097ff0e540fa0b560df2cc61546603d)
2017-01-08 03:06:39 +01:00
treeston 416afdfec5 Creature/CreatureAI:
- Default range for DoZoneInCombat: 50.0f -> 250.0f.
- Add optional second arg to SummonList::DoZoneInCombat to specify range.
- Also a bunch of random NULL -> nullptr cleanup.

(cherry picked from commit b7f2c87d37ad20e9fd39c6f0523f6b5edb9d4a66)

Too many damn stars in that damn argument list.
(cherry picked from commit afbda0476700f272c734ecb5b31474dbf66477f7)
2017-01-08 03:01:51 +01:00
Shauren 182c390ae7 Core/Auras: Renamed fields of SpellProcEntry structure and change types to more appropriate ones
(cherry picked from commit ef7df652560f559f5db0d8842475a9c6259145b0)

Build fix
(cherry picked from commit c03e7ecd05275fc6ab0938f728e1905d1c83e895)

SQL fix
(cherry picked from commit 7a41467cf71e790fb6cffad21db82c7119d8c2e7)
2017-01-08 02:42:07 +01:00
Sirikfoll 5993f91630 Script/SWP Full Rework on M'uru Encounter
(cherry picked from commit 6002acf376556eb413a6b514f14b8a07f8de5099)

Another sql fix
(cherry picked from commit 204acbb5b72d9706cdcf26aede62c2eeec11c6a2)
2017-01-08 02:21:10 +01:00
asterc 882106d169 Core/Battleground Script for Isle of Conquest Bosses
by @gerripeach
(cherry picked from commit c1ed002b4b0d30432b76f9c5df9095ade4b0b171)

SQL file name fix
(cherry picked from commit 74f3a84a019e3d6b71d02c9616238dc1e7b14784)
2017-01-08 02:10:37 +01:00
sirikfoll 037e9053d3 Implement Quest Riding the Red Rocket
(cherry picked from commit 20b3feb5594b1047303509defb8f0aa9df6a0ab9)

Fix SQL name
(cherry picked from commit 2329648cadaa83be0950d6abd4133b37f34d53e8)
2017-01-08 01:33:48 +01:00
Elimination 48b74f0f6a Core/Spells: Fix wrong totem placement
(cherry picked from commit 37b2f590b6d63f230c755f932c2dd356c265486f)
2017-01-08 00:54:08 +01:00
Shauren 7eb1eb1715 Core/Random: Removed ancient and unused MAP_BASED_RAND_GEN
(cherry picked from commit 1ad02a0d61671db707d52aa9f90d770002d6d67f)
2017-01-07 22:36:25 +01:00
Shauren 6f311fea53 Core/Auras: SPELL_AURA_PERIODIC_LEECH can now properly overkill
(cherry picked from commit 3d8bab866831b87d9737a7e2b01e066064c81799)
2017-01-07 22:30:01 +01:00
Shauren 3d9479dcbf Core/Movement: Do not launch pathfinding for splines turning on the spot
(cherry picked from commit 66006e3d0dd499152ce367e72fbf223356670eb6)
2017-01-07 21:54:25 +01:00
Ariel Silva 7f8a4ad3a7 Core/Spells: fix console spam (#17084)
(cherry picked from commit 8d09065525139d4e99d5439978f3c1c95aeb2428)
2017-01-07 21:53:07 +01:00
treeston 489027703e Entities/Unit: Finally fix no-path evasion.
- When a creature cannot find a path to its victim, it begins evading all attacks and regenerating health.
- If this persists for 5 seconds, it evades back to spawn position with new EvadeReason value EVADE_REASON_NO_PATH.
- Also some SmartAI cleanup (why oh why does it have so much duplicated code) and getting rid of #defines in favor of type-checked compile-time constants.

(cherry picked from commit 7b1560fccba77ecbdfecd7b33af740aea41b7087)
2017-01-07 21:33:28 +01:00
treeston f93730b160 CreatureAI: Adjust AI behavior when a charm ends. OnCharmed will be invoked on the creature's base (non-charmed) AI, allowing the AI to react to the creature no longer being charmed.
(cherry picked from commit 26b084a90ff3e4f0601e72c283bd3296d4640585)

align fix
(cherry picked from commit 58486fc19ad51eaff2ef1a4a5ddd8edfdedec28d)
2017-01-07 21:05:34 +01:00
Kito 4fa7cd0c30 Scripts/Icecrown Citadel: Sindragosa - Ice Tomb should always deal damage to all other ice tombs too
Closes #7808
Merges #16863
2017-01-07 20:20:41 +01:00
Shauren 4275a9fdbf Core/PacketIO: Fixed leaving group not fully removing it clientside
Closes #18744
2017-01-07 00:04:24 +01:00
joschiwald 01e44cb794 Core/Spells: Extended remaining 8bit EffectMasks to 32bit 2017-01-06 17:20:04 +01:00