Commit Graph
27422 Commits
Author SHA1 Message Date
Duarte Duarte a53a8fff98 Merge pull request #15582 from mthsena/3.3.5
Config: Typo/Cosmetic changes
(cherry picked from commit 07204140428886f5071cfe3a14dd5d50988268b2)
2015-09-25 00:21:17 +02:00
Duarte Duarte c65aa4cbbe Merge pull request #15579 from M-Pan/3.3.5
Config ; Minor Typo
(cherry picked from commit 7c4dd4059e69e062b60b34d49e1970e4b0d99cd5)
2015-09-25 00:20:39 +02:00
Duarte Duarte 3b1ae19371 Merge pull request #15577 from M-Pan/3.3.5
Revise MaxPrimaryTradeSkill comment

Closes #15575
(cherry picked from commit f7e9acb6edc5c87c95ab2d4ac30394226fa7d215)
2015-09-25 00:20:12 +02:00
Aokromes 78b1923da2 Core/Creature: Fixes Issue with Formations with 2 waypoints
By Malcrom
(cherry picked from commit 75842fb1a5fbae8fead8242656364580c33ead12)
2015-09-25 00:19:34 +02:00
Shauren ef5e3fff04 Merge pull request #15554 from MrSmite/AHBot_Buyer
Fix AHBot Buyer to stop counting own auctions
(cherry picked from commit 811b557b3b352ba7c1b85e289bcadcf9ff103f06)
2015-09-25 00:17:57 +02:00
Aokromes 0eace20ac3 Core/Creature: Fix formations to prevent crossover
By Malcrom
(cherry picked from commit 57fabc78e42ad7b511ae66d12fbb824d2c8e75ee)
2015-09-25 00:16:55 +02:00
Shauren 074b00af37 Core/PacketIO: Updated and enabled SupportTicketSubmitComplaint, SupportTicketSubmitSuggestion 2015-09-25 00:11:54 +02:00
Shauren 5cf28316ff Merge pull request #15503 from Treeston/3.3.5-patchwerk
Creature/BossAI/Patchwerk: Fix Hateful Strike behavior
(cherry picked from commit ce2aa49715860dc2c819d686d8242a113c0b6046)
2015-09-25 00:09:34 +02:00
treeston 888c4c07b6 Scripts/Naxxramas:
Fixed bugs with Sapphiron encounter:
- Sapphiron will now properly re-engage if the previous attempt ended while he was in flight.
- Sapphiron will now properly be hovering while in the air phase instead of standing idly on the ground.
- Move Frost Resistance achievement check from custom script to spell 60539 (Sapphiron Achievement Check), thanks to @Shauren for the heads up.

(cherry picked from commit a90ae075c9de330b40d570aa172708486c0566c4)
2015-09-25 00:07:34 +02:00
jackpoz f2ca107fc8 Scripts/Ulduar: Fix issue reported by static analysis
Coverity defect ID: 1316690

(cherry picked from commit 4cdab0cdcb7081d3b99736a189f7e8a9280fda59)
2015-09-25 00:06:30 +02:00
Duarte Duarte eb65c8051c Merge pull request #15452 from Treeston/3.3.5
Core/Unit: Allow mounting for certain transformations
(cherry picked from commit 6cdfe9dc095bd19ea495c22cb41cd82f1212b6cd)
2015-09-25 00:03:23 +02:00
jackpoz 7893ac6baf Core/Spells: Fix crash happening when using items to cast spells
Fix a crash happening when using items casting spells like Item ID 37198
Fix #14900

(cherry picked from commit 166e66cc06d418b94e14abb30dea6a76ba9edce2)
2015-09-24 23:58:26 +02:00
Carbenium 5147c70c35 Core: Fix build 2015-09-24 23:57:13 +02:00
jackpoz 97f9a3f816 Core/Dungeon Finder: Fix groups queuing broken by 1e71aba2ee656a8407dec63a69d0879e16a070e2
Fix queuing in LFG with 5-men groups leaving the party in queue forever, caused by group GUID being added to list of party members.

(cherry picked from commit 42a71133fa32a1414dc52241c99430178b24422e)

Conflicts:
	src/server/game/DungeonFinding/LFGQueue.cpp
2015-09-24 23:53:20 +02:00
jackpoz 2f0079410d Core/Dungeon Finder: Improve ".lfg queue debug" command
Log roles of every combinations in ".lfg queue debug" output

(cherry picked from commit 16e9882aa86186d85bb2cb9d2b8fbb6165c2fe96)
2015-09-24 23:43:01 +02:00
jackpoz ee7039e845 Core/Chat: Allow to sanitize | characters when sending messages to clients
Add an optional parameter "escapeCharacters" to ChatHandler::SendSysMessage() to properly escape | character, otherwise it might freeze the client.

(cherry picked from commit 7c91984a64c2f78ad17153018a42926dfcf0ae59)
2015-09-24 23:42:23 +02:00
jackpoz adf6d968ed Core/Dungeon Finder: Remove disconnected players from LFG queue
Fix LFG queue issues by removing disconnected players from LFG queue and their party with them.

(cherry picked from commit b7f9836d223925802115f45ad2c2c7eeb9bb00a4)
2015-09-24 23:40:15 +02:00
jackpoz f570a0064c Core/Dungeon Finder: Add LFG roles of group members in LFG logs
This changes logs like "(1|18)" to "(1 Healer, Dps|18 Tank, Healer, Dps)"

(cherry picked from commit 1e71aba2ee656a8407dec63a69d0879e16a070e2)
2015-09-24 23:39:23 +02:00
joschiwald 7a2b87cefb Merge pull request #15385 from Tonghost/3.3.5
Core/Scripts: Remove duplicate code
(cherry picked from commit 5c68223ab60bd0206b90b48e86275c0af79d5097)
2015-09-24 23:30:42 +02:00
joschiwald 010b2182c1 Scripts/Ulduar: fixed sara get killed by guardians of yogg saron
(cherry picked from commit 2b21fbb58e6b213cf26706dd0dd368b2ea4a92b3)
2015-09-24 23:29:23 +02:00
StormBytePP bfdaee68ce Core/Unit: Do not remove aura with interrupt flag AURA_INTERRUPT_FLAG_NOT_UNDERWATER when already flying
(cherry picked from commit 70f029fd0abf28ce7d1b2c0abc3db7a541d8c448)
2015-09-24 23:27:19 +02:00
jackpoz d0ce95fca5 Core/Battleground: Fix issue reported by static analysis
Coverity defect IDs: 1193415

(cherry picked from commit c67118f909fee1ed489e3125cb85f3a8179c1a43)
2015-09-24 23:25:28 +02:00
Trisjdc 93e77bfc7b Core/Players: Improve rest state handling, allow several rest states to be active
Fixes https://github.com/TrinityCore/TrinityCore/issues/15325

(cherry picked from commit c14b66c24c3c0afe222a0401171e882d4a1f98d9)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/MiscHandler.cpp
2015-09-24 23:24:13 +02:00
Nyeriah e5eea44e0a Scripts/OnyxiasLair: Force Onyxia to enter evade mode if pulled out of her room
(cherry picked from commit b28849003c881d0a05624195d435ea903c13d4f8)
2015-09-24 22:56:14 +02:00
Nyeriah 4a37edef51 Scripts\MoltenCore: Disable Ragnaros' combat movement
(cherry picked from commit 8b27b6197848f84a8fe86a6c36c6669f8f006e8d)
2015-09-24 22:55:34 +02:00
StormBytePP b3eb1ead96 Core/Misc: Added checks for procSpell nullptr cases
Fixes Coverity Defect ID: 1023036

(cherry picked from commit 424576e098635f947074d26b088790fce62a07d1)

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
2015-09-24 22:54:17 +02:00
jackpoz 7005089241 Core/Misc: Fix issues reported by static analysis
Coverity defect IDs: 1316687, 1316688

(cherry picked from commit 51a2a3fa93702f289cda1e64323f55aba02f1026)
2015-09-24 22:36:37 +02:00
joschiwald a3732aea48 Scripts/Ulduar: fixed hodir kill credit
Closes #15303

(cherry picked from commit 30fc4f9f63b7a0ce01e5aad4667902991b70e298)
2015-09-24 22:35:33 +02:00
jackpoz 0fad953852 Scripts/Misc: Replace some unsafe WorldObject* class members in scripts with ObjectGuid
Replace some unsafe WorldObject* class members and derived types in scripts with ObjectGuid.
Code cleanup.

(cherry picked from commit 2f92a2f58e171bbfa6dc06d3b2663cbf384a7d38)

Conflicts:
	src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
2015-09-24 22:34:18 +02:00
Laintime 1bf9b61ffa Core/Achievement: Fix Save The Day
Closes #15202
Closes #15211

(cherry picked from commit 79cd2f9bb9e4cc214150ec36a85817bafad814d6)
2015-09-24 22:14:15 +02:00
jackpoz 4700b24263 Core/Misc: Remove unneeded ToCreature() casts
Remove some ToCreature() casts not needed anymore after 1ee90e1022 changes that moved IsPet(), IsTotem(), IsSummon(), IsGuardian(), IsHunterPet() and IsVehicle() from Creature to Unit

(cherry picked from commit ea4d9c0d9e3339c96b94f13bbbfc1318bb6b03f9)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_pet.cpp
2015-09-24 22:06:05 +02:00
jackpoz cacf184822 Core/Misc: Remove unneeded ToCreature() casts
Remove some ToCreature() casts not needed anymore after 1ee90e1022 changes that moved IsPet() from Creature to Unit

(cherry picked from commit d243630acff017f5e50bf0c833a0bbac35ba6c5a)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
2015-09-24 21:04:46 +02:00
jackpoz 6193b8a28d Scripts/Misc: Fix possible crash
Fix possible NULL-dereference exception happening in PlayerOrPet checks used in Ulduar and Temple Of Ahn Qiraj

(cherry picked from commit 5f0f152345ec7e9cc6195ba8f59f316a1cad90f7)
2015-09-24 20:39:42 +02:00
Rochet2 c3c7ab6ec7 Core/RestState: Check area trigger radius instead of 1.0f distance
Closes #15016
Closes #15052

Signed-off-by: jackpoz <[email protected]>
(cherry picked from commit 12931f4762d2592e4b28c6e6bf137b3348230c45)

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/MiscHandler.cpp
2015-09-24 20:29:55 +02:00
jackpoz bfb373ef22 Merge pull request #15119 from robinsch/grounding
Core/Spells: Grounding totem fix

Fixes #15108
(cherry picked from commit 3f3ff8b36b0537d07bf8222226ab88346c689e4b)
2015-09-24 19:59:09 +02:00
jackpoz 175b0bcfb5 Core/Gameobjects: Move a log from FATAL to DEBUG
The log is triggered when a mage creates a portal to another map, uses it and then the portal despawns.

(cherry picked from commit a8ceb18cdfe850fbb84ddd3d917565f2a100ebb7)

Conflicts:
	src/server/game/Entities/GameObject/GameObject.cpp
2015-09-24 19:57:31 +02:00
jackpoz 4ee081f7bc Core/Battlegrounds: Move a log from ERROR to DEBUG
The "error" is a false positive happening every time a player in a Battleground logs out because WorldSession::LogoutPlayer() notifies the bg twice

(cherry picked from commit ca5a2785f760a90ceb0c3d321da208ee07552f87)
2015-09-24 19:54:22 +02:00
MrSmite d9a3bdca61 Core/AHBot: Add missing AHBot quality price ratio to config
Signed-off-by: jackpoz <[email protected]>
(cherry picked from commit fed67f5bc1d531f51b110915e2384333e342c1ed)
2015-09-24 19:51:52 +02:00
jackpoz 57328c69aa Core/Spells: Fix damage done by SPELL_EFFECT_NORMALIZED_WEAPON_DMG
Fix a rare case that would cause SPELL_EFFECT_NORMALIZED_WEAPON_DMG to do 4 billions damage or to trigger an assertion in Unit::CalculateDamage() depending by Unit base damage.
To reproduce the issue cast spell 25816 on a level 1-14 warrior, then make the warrior cast spell 694 on a Creature.

(cherry picked from commit 143026ed19455f5a908ef508d1bf5ce43c092a21)
2015-09-24 19:51:05 +02:00
jackpoz cf67b7d375 Core/AHBot: Adjust AHBot bid and buyout chances
Apply an exponential formula to define the chance to bid/buyout an auction depending on auction price and item price ratio. The formula can be adjusted changing the new AuctionHouseBot.Buyer.ChanceFactor config parameter
Chance = 100 ^ (1 + (1 - (auction_price / item_price) / k)
k is the config parameter AuctionHouseBot.Buyer.ChanceFactor, the higher the number the higher chance to buy overpriced auctions.

(cherry picked from commit 177b6319d1ad49a38fbd06f37671da1e3d1ae4e6)

Conflicts:
	src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
2015-09-24 19:48:31 +02:00
jackpoz 8a5d92726a Core/Spells: Fix Charge "no path" error with even bigger targets
Addition to a328a119784252c6d514436f4ceffa693ac65453 , clamp object size to [0,4] in case of very huge Creatures like Lord Marrowgar entry 36612

(cherry picked from commit 0a94382637ba9212a23e224b4ac2df114acb4ca7)
2015-09-24 19:28:00 +02:00
jackpoz cde1141fb4 Core/Config: Describe better Wintergrasp.Enable option in worldserver.conf
(cherry picked from commit 10620b4e114b86940fb72fcae507ef155d6d234e)
2015-09-24 19:25:01 +02:00
jackpoz 16da2c8d95 Core/Threading: Handle CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE only in WorldSession update because it removes the Player from his Group which is not thread-safe
(cherry picked from commit f07fe63e50062941dd99ce719f27f6d09ecfbd7d)

Conflicts:
	src/server/game/Server/Protocol/Opcodes.cpp
2015-09-24 19:24:02 +02:00
jackpoz cd72a243af Merge pull request #15168 from jameyboor/3.3.5
Core/Creature: Fix Creature::UpdateMovementFlags() ignoring DynamicTree height

Fix Creature::UpdateMovementFlags() checking only maps/vmaps height and skipping GameObject height stored in DynamicTree
(cherry picked from commit a7ee951d9efcfb0a0a5b9ed1ec3a732c06d8877f)
2015-09-24 19:17:06 +02:00
Shauren 8c761b2877 Core/PacketIO: Verified and enabled a bunch of opcodes that already had their structures ported to packet classes 2015-09-24 18:47:33 +02:00
Shauren 91f2bef235 Core/PacketIO: Fixed creature teleports not working clientside 2015-09-23 00:05:18 +02:00
Shauren a338aa408e Core/Misc: Fixed various possibly uninitialized value warnings
CID: 1324648, 1324649, 1324650, 1324651, 1324652
2015-09-22 00:07:05 +02:00
Shauren e6e5f5c559 Partially revert "Core/Build: Added missing abort() calls on error handlers"
This reverts commit 8ea17647e6.
2015-09-21 17:18:55 +02:00
StormBytePP 8ea17647e6 Core/Build: Added missing abort() calls on error handlers 2015-09-21 15:52:34 +02:00
StormBytePP 958fd013e7 Core/Build: Add Trinity::Abort definition in header file 2015-09-21 15:31:49 +02:00