Commit Graph
100 Commits
Author SHA1 Message Date
treeston 31eb40439e DB/Quest: Fix vehicle SAI for quests 12910 and 12855 (Sniffing out the Perpetrator H/A). Tagging issue #17914.
(cherry picked from commit 3219346888ba3beb43424c60764849ec0ea030c5)
2017-02-26 15:30:14 +01:00
treeston dd0df772df Scripts/Events: Globally fix all ExecuteEvent loops to check UNIT_STATE_CASTING after each iteration, instead of just checking it once initially.
Fixes and closes #17892.

(cherry picked from commit ac62d7156f93bf86f57dbad1f24f14031322fd5a)

Drycoding is bad, mmkay?
(cherry picked from commit ed83a35fbeeb7f9005fe4792225fb50700791c6f)
2017-02-19 15:09:02 +01:00
treeston 5654fb9343 Merge branch '3.3.5-goshdangitsmartai' into 3.3.5 (PR #17738)
(cherry picked from commit e9eacae7b2ca3c8899a6ee9c8b8146e21fca54db)

Core/SmartScripts: Add missing break, 5f43e7b follow-up.
(cherry picked from commit a4623efaa67be1cfea19e561be83f118a784b9d1)
2017-02-19 15:07:42 +01:00
treeston cb5ec8fccf DB/Creature: Make Coldarra Spellweavers cast Arcane Missiles (channel) instead of Arcane Missile (triggered spell).
(cherry picked from commit 69d871fc53f818aba5a2b9c7484833cfa5fa7d88)
2017-02-18 18:02:29 +01:00
treeston b47b9a2913 DB/Creature: More fixes for that poor Cabal Abjurist! Plus bonus content for Bleeding Hollow Darkcaster.
I feel like a DB dev now.

(cherry picked from commit f5cbc17387dcd8ac5d05436d3382053e8a0ab55f)
2017-02-18 18:01:40 +01:00
treeston 39a7a71494 DB/Creature: Fix Cabal Abjurist SAI
(cherry picked from commit 5f43e7b964d48d57ec7fabdbf36a832aee53dca4)
2017-02-18 18:00:37 +01:00
treeston 7b3b333dd5 Core/Position: Allow implicit casting to G3D::Vector. Also, add a utility overload to MotionMaster.
(cherry picked from commit 9f15482b849d7a77a4a0cc68f18aabb8ee6c58c9)
2017-02-18 17:55:40 +01:00
treeston ebbcd601b9 DB/Creature: Fix random inhabittype that was making an Outland world elite permanently rooted.
(cherry picked from commit b7112d0fbe457043418415f45f68f159896477d4)
2017-02-18 17:55:05 +01:00
treeston 52f400226e Replace a leftover const char* with a std::string const&.
(cherry picked from commit c0de28b045f6c7d31652262c9b96d0739fec8110)
2017-02-18 17:54:11 +01:00
treeston bbbf8df8e5 Entities/Gossip: The Big One™ that gets rid of all uses of The Bad™ and The Ugly™, e.g. gossip preprocessor macros, and replaces them with the new-and-shiny gossip functions.
(cherry picked from commit d55426f5b4e431e6d398b1e2dbbd25f7387328f2)
2017-02-18 17:50:00 +01:00
treeston f94dc007ae Fix dynamic build.
(cherry picked from commit 54f923fdee9cf8a17e5eaee8a8f0290dadc9905b)
2017-02-18 17:30:23 +01:00
treeston a0d48b92d5 Creature/Gossip: offer replacement functions for the existing preprocessor gossip macros
(cherry picked from commit 175db157f76d8a8de42bb53f1b1564f12600616a)

You saw nothing (build fix).
(cherry picked from commit 72a7f4b507f93d575c406f727bf71e3ecaf20bd8)

Build fix. Again. Oops.
(cherry picked from commit 61eb70fd827e79018449f204ce93b9b6bf46eabf)

....right, I actually went through a full rebuild now just to make sure it works.
(cherry picked from commit 8531f012a2d63df7f505507573639be512c2adba)

Last one. For real. Please. (Build fix #5).
(cherry picked from commit a32536d490a32241a3ac1db9b61109f61a47b02c)
2017-02-18 17:22:53 +01:00
treeston e0b557c858 Entities/Unit: Add overload to NearTeleportTo taking Position const&.
(cherry picked from commit 211eee0fce0bf9720511ad05fae271512b24f48e)
2017-02-18 17:16:10 +01:00
treeston 5c01d14056 Entities/Creature: Add arg2 to DespawnOrUnsummon to allow overriding respawn time. This matches changes that will be merged as part of dynamic spawning, allowing scripts to transition early.
(cherry picked from commit 4bcc8078d734ccf166533e504db703ded6968339)
2017-02-18 17:16:10 +01:00
treeston 77ecafaa42 Entities/GameObject: Expose GO rotation to scripting.
(cherry picked from commit bdbe3f22e008b7153384b43bcec56002676cb26b)
2017-02-18 16:53:44 +01:00
treeston 8a4a51aadf Core/Movement: Properly clear UNIT_STATE_MOVING when reaching chase target.
(cherry picked from commit 6ae887a5a9fd0ac7f4ea7c4fc1dab46f2b1b772c)
2017-02-18 15:57:19 +01:00
treeston df0d32be81 Merge remote-tracking branch 'Treeston/3.3.5-kelthuzad' into 3.3.5 (PR #16634)
(cherry picked from commit 47a9cb1e562b1132df2b7b14e01d9e4f01e85717)

...Huh. Wonder how this one didn't make travis complain on the PR.
(cherry picked from commit 93a68d58814013a1c656bf17afcc94938457adfd)

Was Travis completely napping on this one?
(cherry picked from commit 2d7dec0d39765dbaad3d3f4c9e203070bcd772d5)
2017-02-18 15:57:19 +01:00
treeston bf5988733b DB/Quest: Revert 376d281 and 63c77d2, move changes to reputation_reward_rate instead.
(cherry picked from commit 1ccdad6eb33adcb4848fc6fed36dc181e74b8682)
2017-02-18 15:49:07 +01:00
treeston ab6f8f9fb7 Scripts/HallsOfLightning: Fix Volkhan healing.
(cherry picked from commit 5da3ae0489b4bc2d92559874725a31f66951541a)
2017-02-18 15:49:06 +01:00
treeston 5fd64171a9 DB/Creature: Remove random untargetable flag from a dragonkin in Crystalsong Forest. Sniff confirms flag is incorrect.
(cherry picked from commit eda05a636e240dca9d74c284d97dc43ab09cc791)
2017-02-18 15:49:05 +01:00
Treeston 8b7934f718 Core/Spells: Fix orientation- and targeting-related issues if the creature isn't currently engaged in combat. (#17120)
Also disable spell focus system for vehicle control auras.

Closes #16572
Closes #17016
(cherry picked from commit 6f85422f0b7221dd38eaa70320b8a28b5fe7a2ef)
2017-02-12 17:04:08 +01:00
treeston 3a62ecb516 Core/Conditions: Add new CONDITION_TAXI (46). Does what it says on the tin. Tagging issue #15560.
(cherry picked from commit 08b383305146962f686af716c90f10776a12bc12)
2017-02-12 16:27:20 +01:00
treeston e201647ef5 Core/Spells: Fix Spell::EffectJumpDest not to turn caster to zero orientation when ground targeting.
(cherry picked from commit 78a44dd81edbfe87631b77c989c3e68f984ba22d)

# Conflicts:
#	src/server/game/Spells/SpellEffects.cpp
2017-02-12 16:26:34 +01:00
Treeston 346e4824be Entities/Unit: Cleanup refactor. Changes: (#17819)
+ Unit::m_movedPlayer -> Unit::m_playerMovingMe
+ Player::m_mover -> Player::m_unitMovedByMe
+ Unit::GetMover() -> Unit::GetUnitBeingMoved()
+ Unit::GetPlayerMover() -> Unit::GetPlayerBeingMoved()
+ NEW: Unit::GetClientControllingPlayer()
(cherry picked from commit 8deda7ed7f18615937ec5db2d30a6badc3b157c1)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Handlers/MovementHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/game/Spells/SpellInfo.cpp
2017-02-12 16:24:25 +01:00
treeston 1091174f03 Merge remote-tracking branch 'Treeston/3.3.5-petaggro' into 3.3.5 (PR #17800)
(cherry picked from commit aeeae8d09c81e48d68ee3ff5a9588f8f94f5ad4d)
2017-02-12 16:08:32 +01:00
treeston 573cb9d20f AI/SmartScripts: SMART_ACTION_ADD_QUEST -> SMART_ACTION_OFFER_QUEST. Open quest offer instead of adding straight to log - old behavior can be requested using action_param2. Closes #17735.
(cherry picked from commit ba4d6f63936fe3269e6c8b75358bc00a78fd49df)
2017-02-12 16:07:27 +01:00
treeston 7b13e98327 AI/SmartScripts: Add param3 to SMART_ACTION_CAST and SMART_ACTION_INVOKER_CAST that allows specific triggered flags to be set (rather than all-or-nothing). Ignored if SMARTCAST_TRIGGERED is not set.
(cherry picked from commit 9072e0221b39c19fb6be154c623f45d6a9433db0)
2017-02-12 15:50:43 +01:00
treeston b18b05ee4a AI/SmartScripts: Add SMART_ACTION_DISABLE_EVADE (117).
(cherry picked from commit 14b44af38d33be0cab4cb081c1f911b20db8884c)
2017-02-12 15:46:58 +01:00
treeston d0f4588652 Core/SmartScripts: Add SMART_TARGET_LOOT_RECIPIENTS. Does what it says on the tin.
Use this new target type to fix The Rider of Blood, The Rider of Frost, The Rider of the Unholy. Closes #17817.

(cherry picked from commit e2c915fb43ae27d695c0ab410fb1b14222745e27)
2017-02-12 15:46:19 +01:00
treeston 78748bff93 Entities/Player: Fixed an edge case bug that could cause a character to get stuck in forced recustomization indefinitely if two or more appearance properties were out of bounds.
(cherry picked from commit d08efca201888e988f95e5761f31e9a890948091)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
2017-02-12 14:47:27 +01:00
Treeston 62e7d7042c Core/Creature: Fix health regeneration. Creatures immediately reset to full health upon reaching home, rather than slowly regaining it over multiple seconds, which allows players to re-engage them at less than max health. (#17756)
(cherry picked from commit fdd78d20772701b3e0fd7caf0da2cd5a2e6b6354)

Entities/Creature: Fix spawn health, fdd78d2 follow-up. Fixes and closes #17757.
(cherry picked from commit 5b6eb29b74bbc9e62f12c449b1896a075bdd25a2)

Entity/Creature: Fix spawn health, for real this time. Closes #17757. Also for real this time.
(cherry picked from commit ac35f93c2d6d5436054be474da06c9483e311c36)
2017-02-11 22:58:58 +01:00
treeston d2b5af3a52 Core/Conditions: Add new CONDITION_PET_TYPE (45). Matches target player's pet against specified (value1) bitmask.
(cherry picked from commit e9d4bbc74effad4b16de1a5514cea531f4e5e444)
2017-02-11 22:37:07 +01:00
treeston 12b58eae40 Core/Conditions: Add new CONDITION_CHARMED (44). Does what it says on the tin.
(cherry picked from commit 97855469678bce6101a927c3d0666267c7e4acc2)

# Conflicts:
#	src/server/game/Conditions/ConditionMgr.cpp
2017-02-11 22:36:54 +01:00
treeston af6041740c Scripts/Commands: Some adjustments to make shutdown commands more user-friendly.
- New error message if a shutdown is delayed due to force threshold.
- New status message indicating that a server shutdown was successfully cancelled.

(cherry picked from commit d7602190623153c8f211ad120e22c6e63371f3db)
2017-02-11 22:35:00 +01:00
treeston 8d7ab10efa Scripts/SmartAI: Some clean-up work:
- NULL -> nullptr
- Rename "AssistPlayerInCombat(who)" to "AssistPlayerInCombatAgainst(who)" to reflect what the method actually does
- Code style

No functionality was changed.

(cherry picked from commit 152b3ad5b997f4be06c5bb55ddb15c57a8e28c3b)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartAI.cpp
#	src/server/game/AI/SmartScripts/SmartScript.cpp
2017-02-11 22:34:59 +01:00
treeston d176be59b8 ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds.
(cherry picked from commit 4030e4d780ed60d281c2b0eaff58ed2b40ad7f47)
2017-02-11 22:03:16 +01:00
treeston a0d886020d Core/Spells: Check TRIGGERED_DONT_REPORT_CAST_ERROR flag in SendCastResult rather than CheckCast.
Fixes and closes #16836.

(cherry picked from commit 4b15369378c24784de46fbf4f9591efd1015be36)

# Conflicts:
#	src/server/game/Spells/Spell.cpp
2017-02-11 21:37:42 +01:00
treeston e30cbb960e Core/Spell: Quick readability change. Functionality not altered.
(cherry picked from commit 03bef355001d35c65d17134ea1b878d2a762cd09)

# Conflicts:
#	src/server/game/Spells/Spell.cpp
2017-02-11 16:59:44 +01:00
treeston cc42cd158c DB/TrinityString: typo fix
(cherry picked from commit 01dba54c12777c337d916493889bb92ae93c12be)
2017-02-05 16:53:34 +01:00
treeston 9046483f3c Entities/Creature: Add some more std::chrono overloads
(cherry picked from commit 0547926f179f2e21af4921c43ca2cded5ba7c6a5)
2017-02-05 00:57:17 +01:00
Treeston d8911a9dd6 Creature/Loot: Do not display "lootable" sparkles for player even if others in the group still have quest items to be looted from creature. (#16265)
(cherry picked from commit a49544cc187d3a156b4615907d6b82057364fcc4)

# Conflicts:
#	src/server/game/Handlers/LootHandler.cpp
2017-01-29 21:51:04 +01:00
treeston 5baf6ea4d9 Merge branch '3.3.5-frogger' into 3.3.5 (PR #17261)
(cherry picked from commit 90ff3ce8c8256796cb637fba52e8ae38a0751176)
2017-01-29 21:51:03 +01:00
treeston 6c6f86d34c Instances/DrakTharonKeep: Fix Novos the Summoner. Fixes #17331.
(cherry picked from commit 813e33b92784831e418a41e3ea0080905bb6dabf)
2017-01-13 00:56:41 +01:00
treeston e2710bc232 Scripts/Instances: Fix a bug that would cause the Hodir encounter to never properly begin. Tagging issue #17302.
(cherry picked from commit e5382ee21538e4383a39b4dc0de274e856bb663b)
2017-01-12 03:19:38 +01:00
treeston 95902126a3 Scripts/Outland: Fix a potential crash. Closes #17308.
(cherry picked from commit 96c05dbec0de5dcff60cc7a97e1b35171f3a8930)
2017-01-12 03:18:07 +01:00
treeston 5e99388981 Scripts/Instances: More #16346 follow-ups. Fixed this time: Halls of Reflection, Ignis the Furnace Master, Mimiron and Rend Blackhand.
(cherry picked from commit 27a3eaab334176af6714f98c2eeb27d93334d226)

Scripts/MoltenCore: Fix Ragnaros (#16346 follow-up).
(cherry picked from commit 83e5df563876e037ecc35d5cb5c4e6d3a9ab2355)

Scripts/BlackrockMountain: Nefarian. (#16346 f-u)
(cherry picked from commit 650d7ab596bf956d146a147fdc938d3c6bdae022)
2017-01-12 00:28:10 +01:00
treeston 1a7b4fbe4d AI/SmartScripts: Add action_param3 "disablePathfinding" to SMART_ACTION_MOVE_TO_POS (69).
(cherry picked from commit 123e45c119b39ec36e5051bf83f52da2fa75f376)
2017-01-12 00:07:29 +01:00
treeston 1eb9f8edab Scripts/TotC: More follow-up to #16346. Also code style cleanup. Who names all their creature pointers "temp"?
(cherry picked from commit 4407877f365ff5ae69c30e18201f7d581990be87)

Compiler warning fix.
(cherry picked from commit 7fbd70d4c4a10a742bade4e33a132c0cf7996756)
2017-01-12 00:07:19 +01:00
treeston 8b4435c96c Scripts/Instances: Follow-up to #16346. Fix Illidan and Northrend Beasts.
(cherry picked from commit 4e922a5146889293078d59b881988506a8ac88f4)

# Conflicts:
#	src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
2017-01-12 00:02:30 +01:00
treeston 20ef64c8d8 AI/PlayerAI: Fix potential edge case crash.
(cherry picked from commit 2d2544fab025689912bc94d39b41bd86540ec1be)
2017-01-12 00:02:30 +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
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
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
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
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
treeston a92bfb5505 Scripts/Commands: Small QoL adjustments
- .debug hostil now shows spawn ID (DBGUID) in addition to current GUID (so you can .go creature to it)
- .npc temp now takes an additional argument before the creature entry that determines whether the spawned creature instantly despawns upon death. Default is instant despawn (current behavior).
- Add .npc evade command.
- Add .pet level command.
- .server shutdown and .server restart now fail with an error message if time is below a config var (GM.ForceShutdownThreshold, default 30s) as long as another player is connected.
    - New commands .server shutdown force and .server restart force bypass this limitation.

(cherry picked from commit 0e1eb460d687e545f95caf0f38a16c3feb7132a3)
2016-09-03 13:46:33 +02:00
treeston 051d403624 Entities/Unit: Fix speed update packets if player is being moved by something else.
Closes #17184
Closes #17254

(cherry picked from commit 19fa504ff5a51ded47f516640fc57deb6793547a)
2016-06-10 19:33:12 +02:00
treeston 213c6b73c8 Entities/Unit: Fix aggression checks when testing player pets vs neutral creatures. Pets will no longer be able to attack unattackable creatures in some situations. Fixes and closes #16659.
(cherry picked from commit bf4d8ad310e41fd365246f52f5eef06b3106d930)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
2016-04-16 01:54:40 +01:00
treeston 6dfe9d34f3 Merge branch '3.3.5-naxxcleanup' into 3.3.5. (PR #16524)
(cherry picked from commit f37682b7edd0d711e1120cbdd9d627fb5b9dbde1)
2016-04-10 15:27:49 +02:00
treeston dc07c24c0c Scripts/Naxxramas: Fix an edge case crash in Gothik. Closes #16575.
(cherry picked from commit a23ccc1b83ded39501d690e288be49be8f32b539)
2016-04-10 14:39:32 +02:00
treeston c344feed96 Merge branch '3.3.5-horsemen' into 3.3.5-base (PR #16194)
(cherry picked from commit e8a79737a530fe9b605fa6d62a84c1531d56965b)
2016-04-10 14:32:51 +02:00
treeston 43c3b1b2e0 Merge branch '3.3.5-gothik' into 3.3.5-base (PR #16142)
(cherry picked from commit d23ef5d6d073ecc9a0a401875f216449e031998e)
2016-04-10 14:01:37 +02:00
treeston 88268a9dbd DB/Gameobject: Fix respawn time for quest GO "Daggerfen Poison Manual"
(cherry picked from commit 476eb19f21803f1a624e8100288de90827f8d255)
2016-04-09 17:54:21 +02:00
treeston dbf97bbfbf DB/Creature: Remove a duplicate spawn
(cherry picked from commit a189da71081d2ee2b0fc7c46e2cc464cee9ce388)
2016-04-09 17:52:03 +02:00
treeston 181da2a65c - Clean up spell facing behavior a bit. Visual target behavior should now be a lot smoother.
- Clean up Creature.cpp. NULL -> nullptr, gotta love it.
- Renamed some recently added members of Creature to match code style.

(cherry picked from commit 1cf1d4a1eafb3a31bf87a615d9d947eed6eb0f62)
2016-04-09 17:47:45 +02:00
treeston d25ba64b4c Scripts/Karazhan: Hackfix the Opera event script to make Wizard of Oz actually completable.
Doing it in script instead of removing the flags from DB because I'm pretty sure that the DB flags are correct and there's some RP event missing before she becomes attackable.

(cherry picked from commit dc39de01416cfd9a7c0416ed38964b753098ca8e)
2016-04-09 17:35:45 +02:00
treeston f1b3c9f40c No, Travis, I do not intend to handle SPELL_GROUP_STACK_RULE_MAX. It is not a value that should ever be actually used. Go away.
(cherry picked from commit f8a6ab8ac5420fafb2036a7ab8ccbb8f230ab49b)
2016-04-09 17:32:37 +02:00
treeston 7d8bab240b Entities/Pet: Finally fix pets spamming Blood Pact/Fel Intelligence in some scenarios. Your eardrums will thank me.
(cherry picked from commit 21cfacfba79312febf018b8924c359170569421b)
2016-04-09 17:32:24 +02:00
treeston d5ec4ce97b Entities/Creature: Fix bugs with pets not properly reacquiring target after spell cast. Closes #16824.
(cherry picked from commit accad00567f96b9c8173d680034953a54bdb6462)
2016-04-09 17:28:11 +02:00
treeston 6eb49e4bb2 Unit/PlayerAI: Yeah, we allow charmer to be null now, should probably check for that.
Fixes and closes #16728.

(cherry picked from commit 49de12b1cfaca7f089a1ba2660de4a8644a72e2c)
2016-04-08 23:58:45 +02:00
treeston c23a6085c3 Core/AI: Fix an edge case crash with PlayerAI. Again. Sheesh.
(cherry picked from commit fe707db96f711f94a461306748274fa0bffa0226)
2016-04-08 23:38:49 +02:00
Treeston 9476726edc Merge pull request #16676 from ccrs/summonsinit
Core/TempSummons: avoid use MoveInLineOfSight before InitSummon
(cherry picked from commit 472e78d682cb5d5abf4d60111f238744c07096ac)
2016-04-08 22:58:28 +02:00
treeston cf7436b644 Util/Random: Add randtime(Milliseconds const&, Milliseconds const&) to supersede urandms(uint32,uint32) for scripts being ported to std::chrono.
(cherry picked from commit 224b42c53a6ae212f2d1d550903e019ab8a741d6)
2016-04-08 22:57:01 +02:00
treeston 3b67e57e0e Core/Creature: Prevent friendly vehicles from trying to attack their rider after dismounting.
(cherry picked from commit 89e2afb8f9f3766c6ca0e780371f5421c79064b1)
2016-04-08 22:48:06 +02:00
treeston caa1b82b88 Unit/AI: Making Nayd happy.
(cherry picked from commit 59d02322a78b9f58c51930e085ad6cad9dd95eb0)
2016-04-08 20:39:53 +02:00
treeston 3f6b215fca Fix some behavioral weirdness resulting from 79a945d5 - thanks ccrs.
(cherry picked from commit bfac62c5c914efe1576d39504d5dd75f11f41237)
2016-04-08 20:39:42 +02:00
treeston f4baf7c180 Unit/AI: Move CharmedPlayerAI logic from the SetCharmedBy/RemoveCharmedBy hooks to Player::Update -> Unit::UpdateCharmAI to guarantee thread safety and prevent race condition crashes.
(cherry picked from commit 5354b585e3d8eb89b77b932986a3fbf3b53706c4)
2016-04-08 20:39:30 +02:00
treeston 4726116dbc Core/Threat: Prevent bosses (and other stuff using DoZoneInCombat) from switching off of the person pulling if they are pulled without generating threat.
(cherry picked from commit b5b7ce44cfeb98bf47eb6c9e0c926994ad53ede8)
2016-04-08 20:38:22 +02:00
treeston 430698d203 DB/Spells: "Val'anyr, Hammer of Ancient Kings" now properly shields targets healed by Glyph of Holy Light, Earth Shield and others.
Fixes & closes #16478.

(cherry picked from commit 8267e493d10ce2322d13ab30e6944673000425d4)
2016-04-08 20:37:36 +02:00
treeston c25222c428 Merge remote-tracking branch 'tkrokli/redemption_tirions_tale' into 3.3.5 (PR #16680)
(cherry picked from commit d1a9d7765c3874b0ad9a692fea808b857e734dc6)
2016-04-08 20:32:01 +02:00
Treeston 42a01d62e6 Merge pull request #16457 from Treeston/3.3.5-standstatecondition
[3.3.5] Add condition for unit sitting/standing
(cherry picked from commit b6720af4cb59ea056f423011bae2e0ca5a3952d9)
2016-04-08 20:28:55 +02:00
treeston 604d08db52 build fix
(cherry picked from commit d10c698430af0380bffe2c2e050db2ee741ec96d)
2016-04-08 20:18:07 +02:00
treeston e394cd298b Core/PlayerAI: Some more helper methods added. Also, charmed players no longer break crowd control.
(cherry picked from commit a8f760b69213514f16f24f7af85449c5929f2032)
2016-04-08 20:17:56 +02:00
treeston f5a1b75fbd Core/PlayerAI: More follow-up. Helper functions and some internal cleanup.
(cherry picked from commit 5a3a21c2d02a2e3527ef61641c62d6ad6a44926b)
2016-04-08 20:17:40 +02:00
Treeston adc7ee0c51 Merge pull request #16644 from Treeston/3.3.5-customcharmai
Core/UnitAI: Rework creature-controlled player behavior.
(cherry picked from commit 4e4b2b9a138650ebe6087e18dc392f08dafe4e37)
2016-04-08 20:16:15 +02:00
treeston 745b771a4f Fix Baron Geddon and Ragnaros in Molten Core to do pure fire elemental damage with their melee attacks.
(cherry picked from commit 9c0deaaebbbd2861e10a365e283000008a2a188f)
2016-04-08 20:02:33 +02:00
treeston 9e07adccf4 I don't like drycoding. It's coarse and rough and irritating and it gets everywhere.
(cherry picked from commit d4184065b6d51b250ab08f35e88868cef631ed4b)
2016-04-08 18:43:18 +02:00
treeston b2e4a962d9 Incorrect AI aggression as a consequence of the LineOfSight change, episode three, revenge of the special AIs. Also, hopefully the last. No original trilogy please.
(cherry picked from commit ab194d5ae3b9812ebd5c8f56559e85f1441cf857)
2016-04-08 18:43:03 +02:00
Treeston aca9efc47a Merge pull request #16633 from Treeston/3.3.5-talentinspect
Core/Packets: Adjust 'TalentsInspecting' option
(cherry picked from commit 3e250fe4e80205e7b2d0203aa170bef579be5038)
2016-04-08 18:42:59 +02:00
Treeston a931c7c906 Merge pull request #16637 from P-Kito/lfg_quest
[3.3.5/6.x] Core/Player: Fix dungeonfinder quests not rewarding
(cherry picked from commit 59e59e412fa41d6753b370bbfe8c969eb747b329)
2016-04-08 18:22:37 +02:00
treeston c9b24515a5 Merge remote-tracking branch 'sirikfoll/despawnAtEvade' into 3.3.5 (PR #16528)
(cherry picked from commit c70e3e31a7a0714b92a2a25f27fe3006f1e36caa)
2016-04-08 18:07:34 +02:00
treeston 0654b3b816 Check to make sure we aren't dispelling a buff for _all_ dispel types, not just magic. Closes #15321.
(cherry picked from commit 98860911e237e147c6ffb544c730a8c37de000eb)
2016-04-05 22:14:45 +02:00
treeston 60b98ecc27 Revert "Merge pull request #16483 from Treeston/3.3.5-debuffimmunity" to fix #16589 while I investigate the retail behavior of SPELL_ATTR_0_UNAFFECTED_BY_INVULERABILITY further.
This reverts commit d67e87733b2e258dc4f5613ee7fa40445e3b215f, reversing
changes made to cfed2d7a3ddf4f8121d3359f9888e6116fc82e62.

(cherry picked from commit 26bbba4b8d5fab1a1ccb1c164694f790864ec8e1)
2016-04-05 22:12:11 +02:00
treeston 845f81daa5 Core/AI: Fully move react state check from CreatureUnitRelocationWorker to CreatureAI::MoveInLineOfSight. This means that AI for passive/defensive creatures can now once again use MoveInLineOfSight (and fixes that weird thing where triggers decided it would be funny to attack players).
(cherry picked from commit 8e6fb3b1c50f62d95284cf0cc6c25819622e62f3)
2016-04-05 21:51:17 +02:00
Treeston ac034a51da Merge pull request #16483 from Treeston/3.3.5-debuffimmunity
[3.3.5] Make Web Wrap / Mutating Injection (and others) properly cancel on immunity (Divine Shield/Ice Block)
(cherry picked from commit d67e87733b2e258dc4f5613ee7fa40445e3b215f)
2016-04-05 19:56:26 +02:00