Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,292 Commits 4 Branches 146 Tags
635b8d52d58f7d502fc249c11c1044923e80935f
Commit Graph

5292 Commits

Author SHA1 Message Date
Shauren
635b8d52d5 Core/DBLayer: Prevent committing transactions started on a different database 
(cherry picked from commit f6e2b8cdc1)

# Conflicts:
#	src/server/bnetserver/REST/LoginRESTService.cpp
#	src/server/database/Database/DatabaseWorkerPool.cpp
#	src/server/database/Database/DatabaseWorkerPool.h
#	src/server/database/Database/Implementation/HotfixDatabase.h
#	src/server/database/Database/MySQLConnection.h
#	src/server/database/Database/Transaction.cpp
#	src/server/database/Database/Transaction.h
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/Achievements/AchievementMgr.h
#	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
#	src/server/game/AuctionHouse/AuctionHouseMgr.h
#	src/server/game/BattlePets/BattlePetMgr.cpp
#	src/server/game/BattlePets/BattlePetMgr.h
#	src/server/game/BlackMarket/BlackMarketMgr.cpp
#	src/server/game/BlackMarket/BlackMarketMgr.h
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Item/Item.cpp
#	src/server/game/Entities/Item/Item.h
#	src/server/game/Entities/Player/CollectionMgr.cpp
#	src/server/game/Entities/Player/CollectionMgr.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Garrison/Garrison.cpp
#	src/server/game/Garrison/Garrison.h
#	src/server/game/Groups/Group.cpp
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/Guild.h
#	src/server/game/Guilds/GuildFinderMgr.cpp
#	src/server/game/Handlers/BlackMarketHandler.cpp
#	src/server/game/Handlers/CalendarHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/MailHandler.cpp
#	src/server/game/Handlers/PetHandler.cpp
#	src/server/game/Handlers/PetitionsHandler.cpp
#	src/server/game/Mails/Mail.cpp
#	src/server/game/Pools/PoolMgr.cpp
#	src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp
#	src/server/game/Quests/QuestObjectiveCriteriaMgr.h
#	src/server/game/Scenarios/InstanceScenario.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
#	src/server/game/Spells/SpellHistory.cpp
#	src/server/game/Support/SupportMgr.cpp
#	src/server/game/Tools/PlayerDump.cpp
#	src/server/scripts/Commands/cs_misc.cpp
 2020-03-31 13:42:01 +00:00
Shauren
fe1003bdbd Core/DBLayer: Prevent using prepared statements on wrong database 
(cherry picked from commit e8e89f58fb)

# Conflicts:
#	src/server/bnetserver/REST/LoginRESTService.cpp
#	src/server/bnetserver/Server/Session.cpp
#	src/server/database/Database/DatabaseWorkerPool.cpp
#	src/server/database/Database/Implementation/HotfixDatabase.h
#	src/server/database/Database/MySQLConnection.cpp
#	src/server/database/Database/MySQLConnection.h
#	src/server/database/Database/PreparedStatement.cpp
#	src/server/database/Database/PreparedStatement.h
#	src/server/database/Database/QueryHolder.cpp
#	src/server/database/Database/SQLOperation.h
#	src/server/database/Database/Transaction.h
#	src/server/game/Accounts/BattlenetAccountMgr.cpp
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
#	src/server/game/AuctionHouseBot/AuctionHouseBot.cpp
#	src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
#	src/server/game/BattlePets/BattlePetMgr.cpp
#	src/server/game/Battlegrounds/ArenaTeam.cpp
#	src/server/game/BlackMarket/BlackMarketMgr.cpp
#	src/server/game/Chat/Channels/Channel.cpp
#	src/server/game/Entities/Corpse/Corpse.cpp
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/Item/Item.cpp
#	src/server/game/Entities/Pet/Pet.cpp
#	src/server/game/Entities/Player/CollectionMgr.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Garrison/Garrison.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Groups/Group.cpp
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/GuildFinderMgr.cpp
#	src/server/game/Guilds/GuildMgr.cpp
#	src/server/game/Handlers/AuctionHouseHandler.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/ItemHandler.cpp
#	src/server/game/Handlers/MailHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Handlers/PetitionsHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Handlers/TicketHandler.cpp
#	src/server/game/Loot/Loot.cpp
#	src/server/game/Mails/Mail.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Movement/Waypoints/WaypointManager.cpp
#	src/server/game/OutdoorPvP/OutdoorPvP.cpp
#	src/server/game/Pools/PoolMgr.cpp
#	src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp
#	src/server/game/Reputation/ReputationMgr.cpp
#	src/server/game/Scenarios/InstanceScenario.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSocket.cpp
#	src/server/game/Spells/SpellHistory.cpp
#	src/server/game/Support/SupportMgr.cpp
#	src/server/game/Tools/PlayerDump.cpp
#	src/server/game/World/World.cpp
#	src/server/scripts/Commands/cs_account.cpp
#	src/server/scripts/Commands/cs_ban.cpp
#	src/server/scripts/Commands/cs_battlenet_account.cpp
#	src/server/scripts/Commands/cs_group.cpp
#	src/server/scripts/Commands/cs_lfg.cpp
#	src/server/scripts/Commands/cs_list.cpp
#	src/server/scripts/Commands/cs_message.cpp
#	src/server/scripts/Commands/cs_misc.cpp
#	src/server/scripts/Commands/cs_npc.cpp
#	src/server/scripts/Commands/cs_tele.cpp
#	src/server/scripts/Commands/cs_wp.cpp
#	src/server/shared/DataStores/DB2DatabaseLoader.cpp
#	src/server/shared/Realm/RealmList.cpp
 2020-03-31 13:42:01 +00:00
Killyana
c026b3bad3 Boss/Script: Disable Call assistance for Mr Smite 
Closes #19164
 2020-03-29 18:44:43 +01:00
Killyana
5b2b221177 Boss/Script: Mr Smith will use the proc aura for Nimble Reflexes instead a script 2020-03-29 17:46:08 +01:00
Keader
85d1fd3038 Fixing some white spaces and unneeded header, added in previous commit 2020-03-20 10:57:49 -03:00
Jinnaix
a8a0f6b261 Scripts/Blackwing Lair - Doors correction (#24327) 
Fix all doors
corrected the Chromaggus fight start
correctly close final bossfight door at fight and open it on reset or bosskill
 2020-03-20 10:51:43 -03:00
Shauren
105165c35c nopch fix 2020-03-19 20:34:22 +01:00
Treeston
7ac6ccb36b Core/Chat: Add SpellInfo const* handler for command args. Use it to update .cast <spellId/link> <triggered>. 2020-03-19 16:13:01 +01:00
jackpoz
9d77b2be3b Scripts/GruulsLair: Fix indentation 2020-03-18 15:14:41 +01:00
jackpoz
db07bc9553 Script/ZulGurub: Fix crash 2020-03-17 20:40:48 +01:00
jackpoz
8fd68e805d Script/ZulGurub: Fix crash 2020-03-17 20:23:25 +01:00
Jinnaix
c09d2b7206 Scripts/Deadmines (#24323) 
Remove obsolete Defias Companion spawn from BlastOutDoor Event
 2020-03-17 19:57:06 +01:00
Gildor
43adbfb459 Core/Spells - DK: Fix Icy Clutch dispel (#24289) 
Closes #24269
Patch 3.2.0 (04-Aug-2009): Icy Clutch can no longer miss when Frost Fever hits, however, when Frost Fever is dispelled Icy Clutch will also be dispelled.
 2020-03-14 18:13:43 -03:00
Rushor
f488c36154 Scripts/BlackfathomDeeps: Morridune will now start his pathaction again. (#24298) 2020-03-14 22:02:15 +01:00
Killyana
a40b742c3a Typo 2020-03-14 16:20:35 +01:00
Killyana
1af1e88037 Instance/Script: Fix blackfathom deeps event, use the correct spawn positions and number of creatures 2020-03-14 16:14:41 +01:00
Rushor
71f53104c3 Scripts/BlackfathomDeeps: Summons of Blackfathom Deeps Events will now attack again. (#24285) 2020-03-14 15:58:45 +01:00
sirikfoll
7a4409b51f Creature/Script: npc_ruby_emerald_amber_drake 
Closes #24220
 2020-03-13 16:55:26 +01:00
Rushor
3ddc6e70df Spell/Script: Spawn Blood Pool 
Closes #23878
 2020-03-13 16:21:23 +01:00
Sorikoff
41d80f2d43 Scripts/Ebon Hold: Improve cosmetics for q. The Gift That Keeps On Giving (#24223) 
* Scripts/Ebon Hold: Improve cosmetics for q. The Gift That Keeps On Giving

* Improve cosmetics for q. The Gift That Keeps On Giving

* Fixes

* Fix

* Rename 9999_99_99_99_world.sql to 2020_03_07_03_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-03-07 16:17:00 +01:00
Shauren
e10313b380 Core/Maps: Citizens of Dalaran! Raise your eyes to the skies and observe! Any non-map-default light can now be overriden! 
Closes #24250
 2020-03-06 17:44:10 +01:00
Giacomo Pozzoni
0752584856 Core/Database: Fix build with Maria DB on some distros (#24248) 2020-03-05 20:16:49 +01:00
Sorikoff
2b14b720da Scripts/Ebon Hold: Bloody Breakout (#24126) 
* Scripts/Ebon Hold: Bloody Breakout

* Scripts/Ebon Hold: Bloody Breakout (part 2)

* Improvements

* Fail quest

* Spacing

* Update 9999_99_99_99_world.sql

* Update 9999_99_99_99_world.sql

* Rename 9999_99_99_99_world.sql to 2020_02_28_04_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-28 20:29:08 +01:00
ForesterDev
ffede34ba9 Core/Misc: Moved CanSpeak() method to WorldSession class (#24209) 
* Core/Misc: Moved CanSpeak() method to WorldSession class

(cherry picked from commit 93aa30f447)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/ChatHandler.cpp
#	src/server/game/Server/WorldSession.cpp

* fix merge conflicts
 2020-02-28 19:53:35 +01:00
Rushor
0583445c05 Scripts/Gameobject: Move Orb of Command script to SAI. (#24189) 
* Scripts/Gameobject: Move Orb of Command script to SAI.

* Scripts/Gameobject: Move Orb of Command script to SAI.

* Rename 2020_12_23_00_world.sql to 2020_02_28_03_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-28 19:21:50 +01:00
jackpoz
7a57029d8f Core/Movement: Add support to cyclic splines to GenericMovementGenerator 
GenericMovementGenerator sets the _duration to the return value of spline.Launch(). For cyclic splines, this is the duration of 1 single cycle, while the spline itself never ends.
To support this edge case in GenericMovementGenerator we just never update the _duration timer for cyclic splines.
 2020-02-23 22:07:40 +01:00
ForesterDev
69231581e4 Core/Server: correct timestamp format for shutdown/restart notification broadcasts (#24181) 
* Core/SmartScripts: implement SMART_ACTION_OVERRIDE_LIGHT and SMART_ACTION_OVERRIDE_WEATHER

* Core/Server: correct timestamp format for shutdown/restart notification broadcasts

* remove unexpected changes

* move enum from Common to Util

* Use enum class instead of enum

* Fix width for seconds 0 to 9
 2020-02-22 21:31:37 +01:00
Sorikoff
0f265b4af6 Scripts/Ebon Hold: Massacre At Light's Point (#24106) 
* Scripts/Ebon Hold: Massacre At Light's Point

* Update 9999_99_99_99_world.sql

* Final stuff

* Rename 9999_99_99_99_world.sql to 2020_02_22_00_world.sql

Co-authored-by: Eridium <6587064+Killyana@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-22 21:05:50 +01:00
Killyana
3181a1c87f Boss/Script: Add Crazed Apothecary to Apothecary Hummel encounter 
Closes #19520
Closes #24176
 2020-02-18 20:22:02 +01:00
dr-j
92ac6ca0fe DB/Quest: Reconnaissance Flight 
Closes #23792
 2020-02-17 00:25:23 +01:00
ratkosrb
6176ce92ea Core/Creature: Use proper name for wander distance. (#24133) 
* Use proper name for wander distance.

* Rename db field.

* Fix query.

* Remove underscore from chat command.

* Rename the handler too.

* Update chat command description.

* Fix remaining issues.

* Rename 2020_99_99_99_world_335.sql to 2020_02_16_01_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-16 13:36:56 +01:00
schell244
baa87c43ba Scripts/World: Hourly Bell sound, further improvements (#24147) 
* Improvements for hourly bell sound

* TC codestyle

* added missing breaks and improve codestyle
 2020-02-16 13:27:36 +01:00
Killyana
854419becb Boss/Script: Fix an error in a previous commit 
Closes #24160
Closes #24161
 2020-02-16 00:50:36 +01:00
Giacomo Pozzoni
127455ed4c Scripts/Misc: Attempt to fix the build 2020-02-15 22:13:46 +01:00
Rushor
f0bf447cd1 Scripts/Gameobject: Journal of Jandice Barov- Convert script to SAI. (#24157) 
* Scripts/Gameobject: Journal of Jandice Barov- Convert script to SAI. (Thanks to Sunwell)

* Scripts/Gameobject: Journal of Jandice Barov - Update script and move go spawn to bossscript

* Update boss_jandice_barov.cpp

Co-authored-by: Eridium <6587064+Killyana@users.noreply.github.com>
 2020-02-15 20:18:58 +01:00
Rushor
596b2d1ed7 Scripts/Gameobject: Remove deprecated script for Cat Figurine (#24150) 
Scripts/Gameobject: Remove deprecated script for Cat Figurine
 2020-02-14 23:28:14 +01:00
Rushor
a67dd6ab60 Scripts/Kalimdor: Move script of Hand of Iruxos Crystal to database. (#24141) 
* Scripts/Kalimdor: Move script of Hand of Iruxos Crystal to database.

* Scripts/Kalimdor: Hand of Iruxos Crystal - Add despawn for gameobject.

* Scripts/Kalimdor: Hand of Iruxos Crystal - Add despawn for gameobject.

* Remove unneeded commentline

* Rename 9999_99_99_99_world.sql to 2020_02_11_00_world.sql

Co-authored-by: Aokromes <Aokromes@users.noreply.github.com>
 2020-02-11 18:16:11 +01:00
Killyana
7450be4cfd DB/Text: Fix and remove some npc_text 2020-02-10 22:33:38 +01:00
Sorikoff
53657441aa Scripts/Spells: Nourish (#24057) 
* Scripts/Spells: Nourish

* Rename 9999_99_99_99_world.sql to 2020_02_08_02_world.sql

* Update 2020_02_08_02_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-08 20:55:09 +01:00
Ovah
98d6c501d7 Core/Vehicles: implement vehicle seat addon table to specify seat ori… (#24112) 
* Core/Vehicles: implement vehicle seat addon table to specify seat orientation offsets and exit positions in form of offsets or absolute positions
* converted Traveler's Tundra Mammoth to seat addon table data

* first follow batch

* whoopsie

* Core/Vehicles: go from local copies to pointers

* Update and rename 2020_99_99_99_world.sql to 2020_02_08_01_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-08 20:47:46 +01:00
schell244
f87a4543ad Core/Scripting: fixed hourly bell sounds (#24127) 
* fixed hourly bell sounds

* use switch and moved variable

* fix typo
 2020-02-08 20:35:05 +01:00
Treeston
9304e496cb Core/Misc: Some refactoring, #23603 prep: (#23676) 
- Split SpawnMetadata off from SpawnData
- No longer allocate Creature/Gameobject objects in ObjectGridLoader just to check their typeid and delete them afterwards

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-08 20:22:37 +01:00
Sorikoff
e10239311c Scripts/Spells: Gift of the Harvester (#24111) 
* Scripts/Spells: Gift of the Harvester

* Scripts/Spells: nopch

* Scripts/Spells: nopch

* Scripts/Spells: validate

* Rename 9999_99_99_99_world.sql to 2020_02_01_03_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-01 14:55:16 +01:00
Sorikoff
8c443ae39f Scripts/Borean Tundra: Iruk (#24117) 
* Scripts/Borean Tundra: Iruk

* Apply suggestions from code review

Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com>

* Update 9999_99_99_99_world.sql

* Rename 9999_99_99_99_world.sql to 2020_02_01_01_world.sql

Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-01 14:41:44 +01:00
Sorikoff
74d19691a5 Scripts/The Barrens: Beaten Corpse (#24124) 
* Scripts/The Barrens: Beaten Corpse

* Rename 9999_99_99_99_world.sql to 2020_02_01_00_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-02-01 14:40:34 +01:00
Killyana
c86d4404c8 DB/Creature: Plagued Dragonflayer Tribesman & Plagued Dragonflayer Rune-Caster & Plagued Dragonflayer Handler 
Closes #24122
 2020-01-30 21:11:29 +01:00
Killyana
0ec2a5fd74 Spell/Script: Fix Prison chain for Unworty Initiate 
Closes #24089
The spell 54613 is not used in the game
 2020-01-27 02:49:36 +01:00
Sorikoff
13c81f55e3 Scripts/Ebon Hold: How To Win Friends And Influence Enemies (#24090) 
* Scripts/Ebon Hold: How To Win Friends And Influence Enemies

* Scripts/Ebon Hold: Improve SQL!

* Scripts/Ebon Hold: Final touch

* Scripts/Ebon Hold: Actually final touch

* Rename 9999_99_99_99_world.sql to 2020_01_26_04_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-01-26 21:15:39 +01:00
Sorikoff
552a638e31 Scripts/Borean Tundra: Plug the Sinkholes (#24085) 
* Scripts/Borean Tundra: Plug the Sinkholes

* Scripts/Borean Tundra: Improve SQL

* Scripts/Borean Tundra: Remove item script

* Rename 9999_99_99_99_world.sql to 2020_01_26_03_world.sql

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
 2020-01-26 21:15:00 +01:00
Killyana
c1580108f6 DB/Quest: Convert Reports from the Field to SAI 2020-01-19 22:25:56 +01:00