Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,293 Commits 4 Branches 146 Tags
f7a67099d45cae68964975ac7b60892fdc468d39
Commit Graph

22223 Commits

Author SHA1 Message Date
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
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
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
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
Shauren
6259763469 Core/Misc: Fix invalid utf-8 comments 2020-03-20 21:53:20 +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
Treeston
857f8d9231 Core/Misc: C++17 cleanups, commit 2, the advstd commit 2020-03-19 17:18:01 +01:00
Treeston
ac9004a2f9 Core/Misc: C++17 cleanups, commit 1 2020-03-19 17:01:35 +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
Shauren
f0fe5f8b66 Core/PacketIO: Port guild packets to classes as example of new self-validating strings 2020-03-19 00:17:36 +01:00
Shauren
fbf478685f warning fix 2020-03-18 23:29:47 +01:00
Shauren
f2f47f774f Core/PacketIO: Add a validating string helper class for use in packet classes 2020-03-18 23:20:11 +01:00
jackpoz
9d77b2be3b Scripts/GruulsLair: Fix indentation 2020-03-18 15:14:41 +01:00
Shauren
487370eb93 Core/Achievements: Fix unneccessary variable copy 2020-03-18 00:39:29 +01:00
Shauren
967f21a4b4 Core/Guilds: Implement guild bank gold limit matching client 2020-03-18 00:02:21 +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
NoName
b88881f8ad Core/Spell: SPELL_EFFECT_PULL_TOWARDS correction (#24251) 
* SPELL_EFFECT_PULL_TOWARDS correction

* Hi Appveyor
 2020-03-17 20:01:13 +01:00
Giacomo Pozzoni
6fde051e4e Core/AI: Make critters flee as soon as engaged in combat and make them evade after they stop running in fear (#24320) 
* Core/AI: Make critters flee as soon as engaged in combat and make them evade after they stop running in fear

* Warning and no-pch build fix
 2020-03-17 19:58:07 +01:00
Jinnaix
c09d2b7206 Scripts/Deadmines (#24323) 
Remove obsolete Defias Companion spawn from BlastOutDoor Event
 2020-03-17 19:57:06 +01:00
jackpoz
de923fedc9 Core/Mail: Validate mail subject and body 2020-03-15 21:42:40 +01:00
jackpoz
3fb41da57c Core/Channels: Limit channel length only for custom channels 2020-03-15 21:40:17 +01:00
treeston
01b2ac3ed4 Core/Chat: Disallow hyperlinks from being inserted in various guild-related freetext fields (the client already blocks this) 2020-03-15 19:48:13 +01:00
Shauren
1227e96bd3 Core/ByteBuffer: Fix string format 2020-03-15 16:10:22 +01:00
jackpoz
2707877cf6 Core/Channels: Limit channel length to 31 characters 2020-03-15 16:07:40 +01:00
Shauren
0a2a96efaa Core/PacketIO: Validate utf8 in every client packet 2020-03-15 14:28:29 +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
47c49c3912 Core/Reputation: Fix Oracles/Frenzyheart not being set to war properly 
Closes #9469
 2020-03-13 18:15: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
Rushor
5e6f55381a Spell: Emerald Drake, Dream Funnel 
Closes #24219
 2020-03-13 16:02:07 +01:00