Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,300 Commits 4 Branches 146 Tags
ed1520bda18edbb2a7bf009c2bb1b45579a22e31
Commit Graph

32300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keader
ed1520bda1 Script/Spells: Fixed some codestyle issues of previous commit 2020-04-03 14:00:46 -03:00
Alan Deutscher
2b1b36f561 Scripts/Spells: prevent Drain Soul from cancelling prematurely (#24378) 
More info at https://github.com/TrinityCore/TrinityCore/pull/24390#issue-398263036
 2020-04-03 13:57:20 -03:00
Jozef Dúc
e61c54dce8 Scripts/Spells: Fixed Bloodlust duplicated hook call 2020-04-03 12:51:17 -03:00
Killyana
bbc66308f6 DB/SAI: Spire Frostwyrm use area triggers to start the event instead of los 2020-04-03 17:14:49 +02:00
Lewis Brumby
b48c50ba23 Update action_ip_logger.cpp (#24371) 2020-03-31 22:49:18 +02:00
jackpoz
ac61dc6153 Core/DBLayer: Remove unused class forward declarations 2020-03-31 22:13:09 +02:00
Killyana
593efba961 DB/Locales: Fix locale RewardText for Tharil'zun 2020-03-31 16:35:31 +02:00
Shauren
f7a67099d4 Core/DBLayer: Prevent mixing databases with query holders 
(cherry picked from commit 13440434c3)

# Conflicts:
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
 2020-03-31 13:42:01 +00:00
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
f880132bb9 DB/Locales: Fix locale RewardText for Trial of the Lake 2020-03-31 15:31:58 +02:00
Aokromes
d03aaece7d Rename 2020_03_29_02_world_335 .sql to 2020_03_29_02_world_335.sql 2020-03-31 00:49:35 +02:00
ForesterDev
3c8622dd83 Core/PacketIO: updated spell "cancel" opcodes to new packet class (#24342) 
CMSG_CANCEL_CAST, CMSG_CANCEL_AURA, CMSG_PET_CANCEL_AURA,CMSG_CANCEL_GROWTH_AURA, CMSG_CANCEL_MOUNT_AURA, CMSG_CANCEL_AUTO_REPEAT_SPELL and CMSG_CANCEL_CHANNELLING.
 2020-03-30 17:21:40 +02:00
ForesterDev
c2a76efdca Core/Packets: Added SMSG_WORLD_STATE_UI_TIMER_UPDATE (#24312) 
(cherry picked from commit 7d88f8c491)

# Conflicts:
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Server/Protocol/Opcodes.cpp
#	src/server/game/Server/Protocol/Opcodes.h
 2020-03-30 17:20:09 +02:00
Killyana
f408b45a88 DB/SAI: Fix Captive Crocolisk Chains 2020-03-30 13:54:43 +02:00
jjo72ddd
dcd907a63a DB/Quest: Add some Russian quest_offer_reward_locale 
Ref #24367
 2020-03-29 22:47:47 +01:00
jjo72ddd
583d0b3b96 DB/Quest: Add some Russian quest_offer_reward_locale 
Closes  #24367
 2020-03-29 21:20:55 +01:00
Ovah
61aec37b4f Core/Spells: fixed a possible client crash when casting pull towards dest spells with misc value 0 (#24365) 
* This case is not happening in 335 yet as it barely has any spell with pull towardst dest effects. However, this is very well present in 4.x and beyond so let's add it for future cherrypicks
 2020-03-29 21:23:53 +02:00
jackpoz
9244742527 Revert "Core/AI: Fix reset and interruption of non melee spells" 
This reverts commit cc0c56ceae.
 2020-03-29 21:00:08 +02: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
Killyana
7258d00f93 DB/Creature: Garg & Turgore 2020-03-28 00:15:13 +01:00
Killyana
e19ea30164 DB/Creature: Fix some spawns in Hatchet Hills 
For 3.3.5 only
 2020-03-27 23:59:32 +01:00
Killyana
fa8a99550a DB/Quest: Improvements for Scourgekabob 
Closes #21020
 2020-03-27 17:02:12 +01:00
Killyana
8c51d5cfed DB/Misc: Fix some spawns 2020-03-27 01:33:19 +01:00
Killyana
0ac005e5d3 DB/Quest: Fuel for the Fire 
Closes #21515
 2020-03-27 00:17:04 +01:00
Killyana
794eab2aac DB/Quest: Improvements for The Hunter and the Prince part 2 2020-03-26 19:22:11 +01:00
Killyana
b87744989b DB/Quest: Improvements for The Hunter and the Prince 2020-03-26 18:38:24 +01:00
dr-j
dd6541e316 DB/Quest: The Raven Stones 
Closes #24263
 2020-03-26 00:33:08 +01:00
Jinnaix
630e84e8bc DB/Spawn Groups: Blackwing Lair spawn groups 
Closes #24344
 2020-03-25 21:10:11 +01:00
Killyana
2d048576b2 DB/Creature: Pusillin 
Closes #24114
 2020-03-25 20:59:22 +01:00
Killyana
b825bbc73e DB: Fix some spawns in The Court of Bones 2020-03-25 18:12:21 +01:00
Rushor
3bd903a04f DB/Spell: Fix the proc of the spell parry used in the quest "The Hunter and the Prince" 
Closes #22577
 2020-03-25 16:39:19 +01:00
Killyana
cc0c56ceae Core/AI: Fix reset and interruption of non melee spells 2020-03-22 16:11:19 +01:00
Shauren
b166d12cbe Core/Guilds: Fix guild log 2020-03-21 21:14:49 +01:00
jackpoz
ec49576491 Core/Movement: Don't start a spline with just 1 point in FlightPathMovementGenerator 
Don't start a spline with just 1 point in FlightPathMovementGenerator. This happens when teleporting to a BG while on a taxi after second last node but closer to last node.
In this case the Player will be teleported to the last node.
 2020-03-21 17:42:24 +01:00
jackpoz
296f6aab40 Core/Movement: Improve log when starting a spline with invalid arguments 
Improve log when starting a spline with invalid arguments, for example when starting a spline with just 1 point.
 2020-03-21 17:39:15 +01:00
Jinnaix
890c800cdb DB/Quest: Arugal Must Die & Deathstalkers in Shadowfang 
Closes #24341
 2020-03-21 14:09:14 +01:00
Jinnaix
e1eaff8fbd DB/Formation: Ragefire Chasm corrections 
Closes #24339
 2020-03-21 14:04:59 +01:00
Shauren
6259763469 Core/Misc: Fix invalid utf-8 comments 2020-03-20 21:53:20 +01:00
Killyana
4be5414c12 DB/Quest: Blueleaf Tubers 
Closes #24333
 2020-03-20 18:45:51 +01:00
dr-j
beac4178ef DB: Argent Tournament Horde/Alliance/Tirion Events 
Closes #24262
 2020-03-20 18:03:10 +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
jackpoz
2a41755b58 Core/Spells: Fix missing "Inventory is full" with spells that create more than 1 item 2020-03-19 21:23:35 +01:00
Shauren
96155a4914 Core/PacketIO: Fixed SMSG_UPDATE_OBJECT packets going missing for new items 
Closes #16906
 2020-03-19 20:42:44 +01:00
Shauren
105165c35c nopch fix 2020-03-19 20:34:22 +01:00
Shauren
1cf8163c58 Core/Guilds: Restore guild bank contents hack 2020-03-19 18:29:05 +01:00
Treeston
ca0c50bc45 Core/Misc: C++17 cleanups, commit 3, the header commit 2020-03-19 18:20:55 +01:00
Killyana
264a35617c DB/Creature: Rogg 
Turned into a Blacksmithing Trainer in Cataclysm
 2020-03-19 17:54:30 +01:00