Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,251 Commits 4 Branches 146 Tags
050f95043a4ea213d0ec00a7323dd741e4ef92e6
Commit Graph

30251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jackpoz
7616f22bfb Core/Commands: Code cleanup 
Remove commented out code

(cherry picked from commit eb9bf314c4)
 2017-02-12 16:27:58 +01:00
SnapperRy
f886788a67 Core/SpellArea: only check against spell_area entries for the current quest when updating quest status 
Closes #17804

(cherry picked from commit 0b4b0ea348)
 2017-02-12 16:27:43 +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 08b3833051)
 2017-02-12 16:27:20 +01:00
jackpoz
238072e67a Core/Battleground: Fix crash happening when reporting afk a nonexistent player 
(cherry picked from commit f67d1158d1)
 2017-02-12 16:27:01 +01:00
treeston
e201647ef5 Core/Spells: Fix Spell::EffectJumpDest not to turn caster to zero orientation when ground targeting. 
(cherry picked from commit 78a44dd81e)

# 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 8deda7ed7f)

# 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 aeeae8d09c)
 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 ba4d6f6393)
 2017-02-12 16:07:27 +01:00
ariel-
a934722061 Core/ObjectMgr: added some more sanity checks to creature templates 
- Extra: throwed semicolons around
- Clarified meaning for a vehicleId check (what it said didn't correspond to what was actually checked)

(cherry picked from commit 628792f960)

Core/ObjectMgr: Follow up on 628792f to remove some superfluous warnings.
(cherry picked from commit 768d978bd2)

Core/ObjectMgr: I knew I missed something.
(cherry picked from commit d3495da30b)
 2017-02-12 15:57:34 +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 9072e0221b)
 2017-02-12 15:50:43 +01:00
treeston
b18b05ee4a AI/SmartScripts: Add SMART_ACTION_DISABLE_EVADE (117). 
(cherry picked from commit 14b44af38d)
 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 e2c915fb43)
 2017-02-12 15:46:19 +01:00
ariel-
8ea1a37761 Core/Player: readd player to battleground after a login (but only after adding it to map, preventing a crash). Closes #16141 (again) 
(cherry picked from commit 3f9cf3fdb6)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-12 15:45:12 +01:00
Killyana
4d67347ec0 DB/SAI: Add missing SAI for Mux Manascrambler 
By Kodekc
Closes #17788

(cherry picked from commit 2c8da5e174)
 2017-02-12 15:43:51 +01:00
ariel-
804496e2df Core/World: short circuit setWorldState and avoid a db query in case there's nothing to update really 
(cherry picked from commit c7b8f0f773)
 2017-02-12 15:41:28 +01:00
jackpoz
e5ba8f1e4d Core/MMAPs: Update recast 
Update recast to 64385e9ed0

(cherry picked from commit 1d7013e0e2)

# Conflicts:
#	dep/PackageList.txt
 2017-02-12 15:41:19 +01:00
ariel-
a2acd445fe * Core/ObjectAccessor: optimize FindPlayerByName by saving a map of player names to Player* (#17797) 
(cherry picked from commit a893ecebf8)
 2017-02-12 15:40:14 +01:00
jackpoz
f98e3b0ee5 Tools/MMapGenerator: Avoid saving uninitialized padding bytes to disk 
Initialize padding bytes in MmapTileHeader struct to avoid saving uninitialized data to disk, causing issues when binary-comparing *.mmtile files.

(cherry picked from commit 2585c62e6f)
 2017-02-12 15:39:38 +01:00
Aokromes
c9c12be2f3 DB/Quest: Children's Week quest RewardText variables $N / $g 
Closes #17728 by tkrokli
(cherry picked from commit dc78f1ecfc)
 2017-02-12 15:39:25 +01:00
ariel-
22b9d66cd2 Core/PlayerDump: add missing character_queststatus_* columns to dump 
(cherry picked from commit 7f5756804e)

# Conflicts:
#	src/server/game/Tools/PlayerDump.cpp
 2017-02-12 15:36:13 +01:00
ariel-
5681dc3a64 Core/BattlegroundMgr: Update Battlegrounds each second instead of every tick (just like Battlefield). 
There are some battleground scripts (like SOTA) performing object access every update, this should help throttle the cpu usage.

(cherry picked from commit 9cdbf903e2)

# Conflicts:
#	src/server/game/Battlegrounds/BattlegroundMgr.cpp
#	src/server/game/Battlegrounds/BattlegroundMgr.h
 2017-02-12 15:34:34 +01:00
ariel-
07e8fe115f Core/Player: Do not kick AFK player from BG if it's a GM 
(cherry picked from commit 82517ef462)
 2017-02-12 15:32:57 +01:00
ariel-
a4baffbf6f Core/Scripts: allow ".debug arena" and ".debug battleground" commands to be issued in the console 
(cherry picked from commit 1b44377cda)
 2017-02-12 15:32:48 +01:00
Chaouki Dhib
66d36839f0 Core/Units: Fixed melee range check (#17693) 
* Split Spell::CheckRange() into 2 methods since that method had more than one responsibility.
* Moved melee range logic into its own function
* Moved melee range logic method GetMeleeRange from Spell to Unit class. Unit::IsWithinMeleeRange() and Spell::GetMinMaxRange() both use that method.
(cherry picked from commit d7600f1126)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Spells/Spell.cpp
 2017-02-12 15:32:29 +01:00
Gerhood
2560066b84 Core/Auras: Increase number of auras sent to client except for group updates (#17604) 
(cherry picked from commit 4a38773e3e)

# Conflicts:
#	src/server/game/Handlers/GroupHandler.cpp
#	src/server/game/Spells/Auras/SpellAuraDefines.h
#	src/server/game/Spells/Auras/SpellAuras.cpp
 2017-02-12 15:21:05 +01:00
Aokromes
15531e1740 DB/Creature: missing spawn creature 40405 Kieupid <Pet Trainer> 
Closes #17747 by tkrokli
(cherry picked from commit 9796ee5b14)
 2017-02-12 15:16:59 +01:00
tkrokli
fcd46dd70c Core/Scripts: move Pet Trainer gossip to DB 
SQL content based  on issue 14719 by Killyana,
conditions output from Malcrom's Condition Creator

- remove hardcoded #define gossip options
- enum gossip menu IDs from DB
- remove outdated SD comments at the top of the file

Closes #14719
(cherry picked from commit 03bafe334c)
 2017-02-12 15:16:58 +01:00
robinsch
d94f0f3427 Core/Spell: Remove all raid auras on party leave (#17663) 
(cherry picked from commit dd67f4ed96)
 2017-02-12 15:11:20 +01:00
Dr-J
a71aa14d3e DB/Misc: Updates 
1) Update to conditions for Zombiefest as previous conditions appear to have stopped working correctly
2) Update for Dark Subjugator to prevent these becoming bugged, also correct unit flags for the sentrys to prevent these from agroing player if too close and dropping immune subjugator if killed
3) Conditions to prevent console spam from Bone Warrior closes #17655
(cherry picked from commit c515cdc636)
 2017-02-12 14:54:00 +01:00
tkrokli
4f7db62f4b Core/Scripts: remove script npc_timothy_daniels (#17779) 
The core script `npc_timothy_daniels` is no longer needed,
all the gossip handling is already present in the database.

- remove core script npc_timothy_daniels
- remove ScriptName from c_t entry in DB
(cherry picked from commit e2f395863a)

Rename 2016_08_14_01_world.txt to 2016_08_14_01_world.sql
(cherry picked from commit 6d66adbdf1)
 2017-02-12 14:52:55 +01:00
tkrokli
7223adfea3 Core/Scripts: move npc_mortog_steamhead to DB 
Move core script npc_mortog_steamhead to database
- script contains gossip handling + 1 condition
- both actions can be handled in DB settings
(cherry picked from commit 0c6eeb3abc)
 2017-02-12 14:51:31 +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 d08efca201)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-12 14:47:27 +01:00
ShinDarth
7f38c2759a Core/Worldstates: move WS_ARENA_DISTRIBUTION_TIME declaration 
(cherry picked from commit 54a7b8358e)
 2017-02-12 14:23:09 +01:00
ForesterDev
9d5304fd4f Core/Command: Check account password max length 
(cherry picked from commit fdcea5c7ef)

Rename 2016_08_04_05_world.sql to 2016_08_11_00_world.sql
(cherry picked from commit d4f2f5968a)
 2017-02-12 14:06:35 +01:00
tkrokli
bf896fe2b0 Core/Scripts: remove 2 unused scripts (#17759) 
These scripts are no longer in use:
- generic_creature
- trigger_death
(cherry picked from commit 2507b9f8af)

# Conflicts:
#	src/server/scripts/World/mob_generic_creature.cpp
 2017-02-12 13:30:29 +01:00
Aokromes
011a7c56d3 Core/Arena: Teams don't lose rating after arena draw (#17515) 
By Raydor, closes #16865
(cherry picked from commit 43c3f3a235)
 2017-02-12 13:29:10 +01:00
Shauren
26bb056542 Core/GameObjects: Enable using GAMEOBJECT_TYPE_GATHERING_NODE 
Closes #18378
 2017-02-12 11:49:28 +01:00
joschiwald
ecda7cef7f Fixed Build 2017-02-11 23:23:13 +01:00
Aokromes
d2dd5f9f02 Core/Logs: Fine tune more logs 
And move others to more logical appenders
(cherry picked from commit 1ad24352ac)

# Conflicts:
#	src/server/authserver/Server/AuthSession.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/AuctionHouseHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/GuildHandler.cpp
#	src/server/game/Handlers/LootHandler.cpp
#	src/server/game/Handlers/PetitionsHandler.cpp
#	src/server/game/Handlers/QuestHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Spells/SpellEffects.cpp
 2017-02-11 23:15:24 +01:00
Dr-J
9fffe777ec DB/Misc: Fixes 
1) Make http://www.wowhead.com/quest=13125/the-air-stands-still and http://www.wowhead.com/quest=13235/the-flesh-giant-champion so player only has to tag the elite to receive credit so that if those op elites which assist player does more damage than player they still receive credit.
2) An update to previous script for Murloc Pets
(cherry picked from commit 3755937611)
 2017-02-11 23:01:56 +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 fdd78d2077)

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

Entity/Creature: Fix spawn health, for real this time. Closes #17757. Also for real this time.
(cherry picked from commit ac35f93c2d)
 2017-02-11 22:58:58 +01:00
Nyeriah
e57efc201a DB/Misc: Fix a couple of start up errors and allow the mounted version of Attumen the Huntsmen to skip player damage check 
(cherry picked from commit 358af1ccc2)
 2017-02-11 22:45:21 +01:00
ariel-
03afe0dd35 Update ObjectMgr.cpp 
(cherry picked from commit ac3bfd111d)

# Conflicts:
#	src/server/game/Globals/ObjectMgr.cpp
 2017-02-11 22:44:00 +01:00
Aokromes
a77263da10 Core/Log: Move log to more logical loglevel 
(cherry picked from commit e4ad88245a)

# Conflicts:
#	src/server/game/Achievements/AchievementMgr.cpp
 2017-02-11 22:43:15 +01:00
Aokromes
0ff577853e Core/Logs: Fine tune more logs 
And move others to more logical appenders
(cherry picked from commit b65d26b5b4)

# Conflicts:
#	src/server/game/Handlers/PetHandler.cpp
 2017-02-11 22:42:34 +01:00
Aokromes
0096945c07 Core/Logs: Fine tune another log 
(cherry picked from commit e1cbd2c34a)

# Conflicts:
#	src/server/game/Movement/Spline/MoveSpline.cpp
 2017-02-11 22:38:01 +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 e9d4bbc74e)
 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 9785546967)

# 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 d760219062)
 2017-02-11 22:35:00 +01:00
Aokromes
db668cde46 Core/Logs: Fine tunning some logs 
(cherry picked from commit b51409a5d3)

# Conflicts:
#	src/server/game/Texts/CreatureTextMgr.cpp
 2017-02-11 22:35:00 +01:00