josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,286 Commits 1 Branch 0 Tags
e186a10603f4a9bdd818514fcc60f16d33fd724b
Commit Graph
76 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ariel- c229816104 Core/Entities: moved duplicated triggered cast proc check to Unit::ProcDamageAndSpellFor, it was preventing some always triggered auras from proccing. 
(cherry picked from commit 19e757af5cb6bbde3f9263f0f4aaec87a7e0301c)
 2017-02-26 15:30:14 +01:00
ariel- 945bbbfa77 Core/AI: updated SpellTargetSelector::operator() (#17824 follow-up) 
(cherry picked from commit 805637cea15470dac4b9417494e4d89f1c1d3239)
 2017-02-26 15:30:14 +01:00
ariel- 4957a17cb1 Core/Battlefield: container optimization 
(cherry picked from commit 932d31598d697bd6cdb4f83ec70018e789984948)
 2017-02-26 15:30:13 +01:00
ariel- 4d061e0b49 Core/Battlefield: fix Wintergrasp defender portal logic 
(cherry picked from commit 43c071d0c88fc546517902dbe0f58fd69bc04b18)
 2017-02-26 15:30:08 +01:00
ariel- a82e9e5150 Core/Scripts: move Icehowl unroot after movement (MotionMaster does not update if unit is Rooted) 
Closes #17864

(cherry picked from commit 47a43b21c883492c4f3acebf633b5002cf58f4a0)
 2017-02-26 15:30:08 +01:00
ariel- 0afe0e536d Core/Scripts: Implement Flag of Ownership. Closes #12265 
Core/Spells: Implemented TARGET_CORPSE_SRC_AREA_ENEMY. Closes #12803

(cherry picked from commit bc4b4f656cda98be06c03301f22750804fea8fa0)
 2017-02-26 15:30:07 +01:00
ariel- 934f038753 Core/Scripts: Removed Glyph of Backstab. 
(cherry picked from commit 31399d5f3466fe26a35194d63ca618168a162867)
 2017-02-26 15:30:02 +01:00
ariel- b1b150a419 Core/Transport: do not relocate players on board of vehicles when near teleporting. Vehicle should take care of that 
(cherry picked from commit 7470bf6b97eed6732fd1e076bb290f4f97e402a3)
 2017-02-19 15:34:57 +01:00
ariel- b239afb0ef Core/Misc: calculate rotation fields from orientation in some places it's impossible to get: 
- SmartScripts: SMART_ACTION_SUMMON_GO
- Spell Effects:
  * SPELL_EFFECT_DUEL
  * SPELL_EFFECT_SUMMON_OBJECT_WILD
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT1
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT2
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT3
  * SPELL_EFFECT_SUMMON_OBJECT_SLOT4
- Command Scripts: .gobject add

Closes #17891

(cherry picked from commit 14445d2202de1b58dcb04c5457be682b8e7075ca)
 2017-02-19 15:34:57 +01:00
ariel- 255dd29562 Core/Spell: no need to bloat existing parameter lists. (f81754a306a8b1f24f0b130ded3c8170e9b146c5 follow up) 
(cherry picked from commit 4829cca9fb81b27cd9a057355ee7b03ff71e0a14)

Note to self: drycoding is bad
(cherry picked from commit 7e8a08c3516d8f5e48882a01a2ccdb8881dd8283)

Another build fix.

(it was probably better to just revert the commit instead)
(cherry picked from commit be8d1136994fd5f0a90b03a52d21c9503857f15f)
 2017-02-18 18:07:07 +01:00
ariel- ced908d835 DB: Add missing racial mounts to faction change 
(cherry picked from commit 54c6fdba3f37e5a255f7c946d6a5f770a481c8fa)
 2017-02-18 18:05:46 +01:00
ariel- 33ce2a8c82 DB/Creature: Hardened Steel Skycaller 
Fix correct spell, was 52775 Summon Escort
(cherry picked from commit c4cb2d4e35aacd82470d0ca34e7ac079aa7c8da4)
 2017-02-18 18:03:19 +01:00
ariel- 163f5b02af Core/Spell: Workaround cobra strikes into a charged aura instead of stacked. 
Fixes #754

(cherry picked from commit 65d0a9478dfcd6c503f78bdf91510e671ea0354f)
 2017-02-18 17:59:17 +01:00
ariel- 7a971d7ed2 Core/Spells: register SPELLMOD_CRITICAL_CHANCE in casting spell modifiers. 
(cherry picked from commit f81754a306a8b1f24f0b130ded3c8170e9b146c5)
 2017-02-18 17:57:55 +01:00
ariel- 13562184e3 Core/Spells: Remove spellmods from SpellMod owner instead of caster (needed so pet casts properly remove aura charges) 
(cherry picked from commit 3aa145cbe1eec715eb8e0942fe36900bb7d6dc47)
 2017-02-18 17:57:38 +01:00
ariel- c71a04d0f0 Core/Spells: fix Bullheaded immunities 
Closes #421

(cherry picked from commit 11f6801a5c9c92775864545be7ace85ac1883686)
 2017-02-18 17:57:08 +01:00
ariel- d4a2a725e4 Update SpellEffects.cpp 
(cherry picked from commit 5b81f55141791292e438606c9d7d942e2f5a8d2b)
 2017-02-18 17:20:42 +01:00
ariel- 27208252ee Core/Spell: Calculate GO rotation for SPELL_EFFECT_TRANS_DOOR 
(cherry picked from commit f5a0342913bc569d9b54ab116812094adf67e2e1)

# Conflicts:
#	src/server/game/Spells/SpellEffects.cpp
 2017-02-18 17:19:40 +01:00
ariel- 8a3f053a2f Core/GameObject: save spawn GOState and reset to it instead of toggling from whatever current state we have 
Prevents exploit of SMART_ACTION_ACTIVATE_GOBJECT

(cherry picked from commit be3199314ab4c8fba31dd29cbc3a79838e5b3138)
 2017-02-18 17:17:18 +01:00
ariel- 54b038fe2f Core/Entities: Added possibility to construct a Position using a G3D::Vector3 
(cherry picked from commit 17917171f3bb7d8c5727a1611ed017ebeccf5ae7)
 2017-02-18 17:16:11 +01:00
ariel- b3f993894a Core/Scripts: Professor Putricide oozes, reapply passive proc auras on reset, and register them as PP summons since they're summoned by a trigger. (f183ed3c50cdcf13cd9fe608e0f4791177f120a4 follow-up) 
(cherry picked from commit 27590fbb9856c77af49bcf396e86db8f8f3aec9d)
 2017-02-18 17:16:11 +01:00
ariel- 7f66c730ec Update boss_kelthuzad.cpp 
(cherry picked from commit 7e4abce820072966dd060c18c8f9901b6da04c98)

Core/Scripts: fix math error that would not select points on the entire circle
(cherry picked from commit cd9226e755640712b308753a43336fdc43af05f5)
 2017-02-18 16:54:56 +01:00
ariel- c04384b691 Core/SmartAI: fix warning reported by VS2015 
(cherry picked from commit 83c032c2a8cd688183c29ca5caffc26817d11a03)
 2017-02-18 15:49:06 +01:00
ariel- 4910966f18 Core/Unit: removed ancient workaround changing spell caster based on triggering aura. 
Keep an eye out for those broken scripts!

Closes #17739

(cherry picked from commit f183ed3c50cdcf13cd9fe608e0f4791177f120a4)
 2017-02-18 14:29:24 +01:00
ariel- 32bdbb00d0 Core/Entities: fix a crash that would happen whenever a player logged back in to an ended arena battle. Thanks Nawuko for the input 
Closes #17825

(cherry picked from commit 6d4eead3a9ca6ac74caa11cdf6fb754ddcc73005)
 2017-02-12 16:50:26 +01:00
ariel- 0925c350e7 Core/Battlefield: Cleanup of Wintergrasp script and battlefield system: 
- Standards: Moved all statics to cpps where they belong.
- Changed spawn position container from fixed size array to std::vector (not all positions were used in every case)
- Removed unused parameter teamId from Battlefield::SpawnCreature
- Removed workaround for GO rotation, added in a69cbeb9d5776025452009733f13ff3a631315e8
- Added rotation parameter to Battlefield:SpawnGameObject
- Added sniffed rotation to existing script spawns.
- Implemented Archavon's Log (Closes #16880)

(cherry picked from commit 1deb7d2df178a98bc1b1cde2ca99301e7ee85ecb)
 2017-02-12 16:50:06 +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 628792f960e035ca1ce10dcfbea2297a20c1e00c)

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

Core/ObjectMgr: I knew I missed something.
(cherry picked from commit d3495da30bdfa9c198a2f304c29a1b0b994bf4c4)
 2017-02-12 15:57:34 +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 3f9cf3fdb6ab4d8c696c67df8289df016f9447ae)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
 2017-02-12 15:45:12 +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 c7b8f0f773b5c5ad711ae73475a4db9f6174de81)
 2017-02-12 15:41:28 +01:00
ariel- a2acd445fe * Core/ObjectAccessor: optimize FindPlayerByName by saving a map of player names to Player* (#17797) 
(cherry picked from commit a893ecebf80bd85c4654249406b278e856a805f7)
 2017-02-12 15:40:14 +01:00
ariel- 22b9d66cd2 Core/PlayerDump: add missing character_queststatus_* columns to dump 
(cherry picked from commit 7f5756804edeb50cea1debe994ebed84e315f5cc)

# 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 9cdbf903e28fca303c580b096016e26c402a6a7f)

# 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 82517ef46277170cc8db703d9e3a22078a4acb66)
 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 1b44377cda1065285dd3f53d90fc9b4360b6624b)
 2017-02-12 15:32:48 +01:00
ariel- 03afe0dd35 Update ObjectMgr.cpp 
(cherry picked from commit ac3bfd111d60bc4a11ef41855113c8a10fba8ff1)

# Conflicts:
#	src/server/game/Globals/ObjectMgr.cpp
 2017-02-11 22:44:00 +01:00
ariel- 9c0f2c4945 Core/PvP: Gameobject rotation in BGs and Wintergrasp. 
- Add a workaround in BattleGround correcting for bad rotations in BG scripts
- Calculate rotation from rotation in Wintergrasp, this function hasn't a rotation parameter and should be added in the future.
- Also removed an ugly hardcode in Battlefield::SpawnGameObject

Closes #17711

(cherry picked from commit 33fbc453d236d943c24fb10522ac0720c3174c3d)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
 2017-02-11 21:37:40 +01:00
ariel- 41fad95ad8 Core/Battlegrounds: do not teleport GMs if out of bounds before starting 
(cherry picked from commit 80a463bccb4275f77ce5dd6cd4ae33ee2ba90862)
 2017-02-11 21:09:01 +01:00
ariel- 04f7de8957 Core/Spells: Abyssal Shatter should have a chance to skill up 
(cherry picked from commit 0d91ccf6bd066d64283e4b31fc005584682c4107)
 2017-02-11 20:59:21 +01:00
ariel- eb6ecb99e6 Update BattleGroundHandler.cpp 
(cherry picked from commit dff18152fc7411c7c77ad6740c32b3a9c68557ad)
 2017-02-11 20:51:03 +01:00
ariel- c429e7d489 Core/Entities: debloat SummonGameObject parameter list using proper wrappers and enable GO rotation in scripts 
- There's still an overload allowing for x, y, z, o to be passed directly
- Fixed default animstate for GameObject creation in many places, it should be 255, not 100 (checked in sniffs)

(cherry picked from commit 62bfee37cb21584cef631dda428feaf5eb829cda)

# Conflicts:
#	src/server/game/Battlefield/Battlefield.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/GameObject/GameObject.cpp
#	src/server/game/Entities/GameObject/GameObject.h
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Entities/Object/Object.h
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_gobject.cpp
#	src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
#	src/server/scripts/Kalimdor/zone_feralas.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
#	src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
#	src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
 2017-02-11 20:50:29 +01:00
ariel- 07f2f37329 Core/Spell: fix one logic fail when calculating level penalty 
(http://wow.gamepedia.com/index.php?title=Spell_power&oldid=1751770#Spells_learned_before_level_20)

(cherry picked from commit c271e196c8bb02705d8a3e4a7432bbc2959f0b1a)
 2017-02-11 17:58:59 +01:00
ariel- c7d2ca3030 Dep/gSOAP: Update gSOAP to 2.8.33 
(cherry picked from commit 3056feb9b2a92717984b435a71c8a54b471c8d46)
 2017-02-11 17:43:06 +01:00
ariel- 24847c01ef Dep/gSOAP: Remove pointless diff not valid after d42c048818 
(cherry picked from commit f87e65bca8d1c9ab1cec1988a3502ac47a7dcb20)
 2017-02-11 17:42:59 +01:00
ariel- 3532173ee3 Core/Vehicle: delay position update in Vehicles, this may be deleted on UpdatePosition, generating a crash 
Closes #17634

(cherry picked from commit 6b3067f978b3342bddca9d0e06d133d54c5036e0)

# Conflicts:
#	src/server/game/Entities/Vehicle/Vehicle.cpp
 2017-02-11 16:56:07 +01:00
ariel- 781891a857 Core/Handlers: actually check allowed trainer classes and races to avoid spoofing 
Closes #14586

(cherry picked from commit f87f7619aa8f8662b79fdb5e190a84c646ad0cb2)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Handlers/NPCHandler.cpp
 2017-02-11 16:39:45 +01:00
ariel- e56633dbd9 Update ItemPrototype.cpp, codestyle and indentation cleanup 
(cherry picked from commit a6005d98e73c96c952d0992c3133d1c3368efbb6)

# Conflicts:
#	src/server/game/Entities/Item/ItemPrototype.cpp
 2017-02-11 15:57:08 +01:00
ariel- c827443d4a Core/Player: Misc codestyle 
(cherry picked from commit bdbd5b0961d20f883821ae33dd5c2b1a2b165b29)
 2017-02-11 15:49:32 +01:00
ariel- 8d45095e28 Core/Entities: implement SPELL_AURA_MOD_CRIT_CHANCE_FOR_CASTER, fixes talent Point of no Escape 
(cherry picked from commit 2feb53ecb69d66bb6df3f48d9a5f4e6a00aec1f7)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Spells/Auras/SpellAuraDefines.h
#	src/server/game/Spells/Auras/SpellAuraEffects.cpp
 2017-02-11 15:14:04 +01:00
ariel- 32fd993dd7 Core/Entities: Readded check removed in d7460887c84107c9c83a9dd5259c8ab398928711, caused flying ghost players to not move if they died during a root effect, root flag was never cleared clientside and impeded movement. 
(cherry picked from commit ef85d01746b744d563d7c17a0734bf7e562dfab0)

# Conflicts:
#	src/server/game/Server/WorldSession.cpp
 2017-02-05 21:23:29 +01:00
ariel- 635ea3258b Core/Loot: fix bug introduced in a49544cc187d3a156b4615907d6b82057364fcc4 in which creatures only having gold wouldn't show lootable sparks, and thus couldn't be looted 
(cherry picked from commit 59f71f915a03143a3896bcf55649bea44969800c)
 2017-02-05 21:14:22 +01:00
ariel- a5502cb7ec Core/Player: fix crash 
Closes  #17073

(cherry picked from commit 028e473ec4693291266770616bcc54b71fefa835)
 2017-02-05 21:09:09 +01:00
ariel- 5d36f29843 Core/Misc: remove two synch queries and replace them with CharacterInfo cache 
(cherry picked from commit 1a52c1cd36b567fc595afa4a5373cc9e6b461a37)
 2017-02-05 21:07:32 +01:00
ariel- 5565defd9f Core/LFGMgr: fix race condition in _SaveToDB 
(cherry picked from commit 94fb921cea188bd24080a691236ae6c3479a0ab2)
 2017-02-05 21:07:32 +01:00
ariel- 587c6da262 Core/ArenaTeamMgr: fix race condition in LoadArenaTeams 
(cherry picked from commit b991f3e13d67fa9a2fd0514953003c8459a26c04)
 2017-02-05 21:07:32 +01:00
ariel- f2c5c6995f Core/World: fix race condition in _UpdateRealmCharCount 
(cherry picked from commit 5251dadf2976cd0bfb38523af844da34af92561b)
 2017-02-05 21:07:31 +01:00
ariel- e5e1834bd5 Core/Player: silence warning 
(cherry picked from commit dda338ece607367f6370f01dfdc54ff7cc55b92b)
 2017-02-05 21:07:30 +01:00
ariel- 5f666a2ce6 Core/Spells: Fix Roar of Sacrifice damage part (#17519) 
(cherry picked from commit 6988407b43ec92af4ffed60cdb8b4bc884487039)

Rename 2016_99_99_99_world.sql to 2016_07_16_03_world.sql
(cherry picked from commit 4bcb5a058bf735bfc2b32f3900b9a9bb494ae15d)
 2017-02-05 20:35:19 +01:00
ariel- ad6e0b6d79 Core/Unit: remove duplicate resist roll in Unit::MeleeSpellHitResult (#17520) 
(cherry picked from commit cfbfa8158ac1220aaed669fde77e1fd96e70a96e)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
 2017-02-04 23:59:07 +01:00
ariel- d40c151cc8 Core/Scripts: Extended SMART_ACTION_SET_INST_DATA to also set BossStates. (#16739) 
Scripts/Dire Maul: Initialize boss states array so it may be called from SmartAI. (Ref #6429)
(cherry picked from commit d1d0c64ad11cb3faf986a5332fec6b704fb8026c)

# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
 2017-01-29 18:04:10 +01:00
ariel- 9371c5c7d1 Core/Script: moved SAI to cpp for The Etymidian, closes #17053 (#17330) 
(cherry picked from commit f03dc799591afe9421b1970fa9b07465bf6ef312)

Rename 9999_99_99_99_world.sql to 2016_06_13_04_world.sql
(cherry picked from commit 90ba7fe938241b6900daaef950e89b58da1e514f)
 2017-01-13 00:56:29 +01:00
Ariel Silva 7f8a4ad3a7 Core/Spells: fix console spam (#17084) 
(cherry picked from commit 8d09065525139d4e99d5439978f3c1c95aeb2428)
 2017-01-07 21:53:07 +01:00
ariel- 780d1019f2 Core/ScriptMgr: use vector instead of list to contain Spell and Aura scripts and hooks 
(cherry picked from commit cbb5c073ceb951fa138bb05b55de8b21ffd83063)
 2016-11-14 05:35:41 -03:00
ariel- f7d351fb70 Core/Battleground: Fix issue reported by static analysis 
(cherry picked from commit 58c5011499056cf2c415e24e854a3de93a870f9e)
 2016-11-14 05:35:38 -03:00
ariel- b7e70906c1 Core/Misc: codestyle fixes in GridNotifiers.h 
- Removed dead code, outdated comments
- Fixed indentation
- Explicitly delete copy ctors
- const'd the operator() definitions

(cherry picked from commit c98ab6bd94f2f5e4b8b28f06a326a4b4da8d3915)
 2016-11-14 05:35:35 -03:00
ariel- 99c3f96f1a Core/Player: Fix logic fail in ApplyEquipCooldown 2016-10-11 20:04:05 -03:00
ariel- 015bc75d75 Core/Channels: remove unneeded default constructor 
(cherry picked from commit 2a5548a13eaa285a34beada053ee6d55b411fe8c)
 2016-10-07 12:05:48 -03:00
ariel- 8a35fb2323 Core/Channels: fix nopch build, take two 2016-10-07 02:04:54 -03:00
ariel- 5071dc8465 Core/Channels: fix nopch build 2016-10-07 01:59:39 -03:00
ariel- 59a9bc5ca0 Core/Channels: Revamp of channel system 
* Core/Chat: general cleanup and revamping: (#17576) (fbbb03212e93591a77a1169a30fb01867cd3c0e9)
* Core/Channel: restore accidentally deleted line, fixes channels not honoring ownership setting (7c714179930c8c369f124d8d1404656fff0a1199)
* Channel Followup: avoid setting an invisible gm as Channel owner (#17597) (8a8362ef153eca50be0bcb5670e615b9685607fc)
* Core/Channel: change the way channels are stored and sent to client, fixes multiple channels per zone when using different locales (#17980)
 2016-10-07 01:09:28 -03:00
ariel- ed53439d9d Build: Added 1.62 Boost version to FindBoost 
(cherry picked from commit 7906bdc15eeabba3b6ecd3faf9ee0fc30e39d101)
 2016-10-03 09:26:59 -03:00
ariel- 9b3aacc56d Update pull_request_template.md 2016-09-28 14:37:31 -03:00
ariel- bc6213d192 Update issue_template.md 2016-09-28 14:36:08 -03:00
ariel- 8c625f0f89 Core/GameObject: added possibilty for gameobjects to contain money loot. 
Updates #14564

(cherry picked from commit b091415c03ffbfb5a7534d6b087101b15640fae7)

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp

Core/GameObject: migrated non-WDB fields to new gameobject_template_addon table

(cherry picked from commit bd4bf0a73fa29701835176ce757e2fb498b39cdc)

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp

Core/GameObject: cache pointer to GameObjectTemplateAddon

(cherry picked from commit 33102220e53731ca958b46e87abacdce07e3aa88)

Conflicts:
	src/server/game/Entities/GameObject/GameObject.cpp

Core/ObjectMgr: filter out bogus check

This restores previous behaviour
(cherry picked from commit 7028503e8f80dc5488ea9dbf33f595ef2044001d)

Typo fix
(cherry picked from commit fe3a0bf7e135cf8ba9035c4d3c271969d2915aaa)
 2016-08-29 19:20:06 +01:00
ariel- 78041c6438 Core/ObjectMgr: throw some consts and nullptr around 
(cherry picked from commit 8727048af67f6e416f82b4c8498d9c072069371f)

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
 2016-08-29 01:38:39 +01:00
ariel- f915ab2c86 Core/Account: Fix race condition in AccountMgr::UpdateAccountAccess 
(cherry picked from commit 6c0b98f24c6aaf425fe654a4d44146e097352606)
 2016-08-10 18:40:58 +02:00
ariel- 02b98010cd Core/Misc: remove unused function prototype 
(cherry picked from commit 2efd40b8049efc4c35622a7997cc47b10b468b4d)
 2016-08-02 21:23:00 +02:00