Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,229 Commits 4 Branches 146 Tags
97fc632b9d32727480d42e7c056dff72ead8fb4e
Commit Graph

9515 Commits

Author SHA1 Message Date
Vincent-Michael
97fc632b9d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Server/WorldSession.cpp
 2013-09-01 23:48:40 +02:00
Shauren
f388ceb8bd Merge pull request #10687 from jackpoz/farsight_fix 
Core/Spell: Fix farsight log error "Player requests non-existing seer"
 2013-09-01 13:52:05 -07:00
jackpoz
1417f62453 Core/Spell: Fix farsight log error "Player requests non-existing seer" 
Partially revert 167ca565d0 which wrongly used TYPEMASK_UNIT to denote Creatures and Players, so when a Player sent farsight opcode with another Player as target HandleFarSightOpcode() couldn't find the right Unit filtering by typemask TYPEMASK_SEER.
 2013-09-01 22:35:48 +02:00
Shauren
e8a566b3b1 Core/Objects: Removed obsolete code 2013-09-01 22:30:07 +02:00
Shauren
79d1b7f543 Scripts/Misc: Removed unused fields and fixed a warning about uninitialized value 2013-09-01 20:33:52 +02:00
Nay
cd11366690 Merge pull request #10694 from jackpoz/loopcounter_race_condition 
Core/Thread: Fix race condition in FreezeDetectorRunnable
 2013-09-01 10:05:39 -07:00
Nay
582686090d Merge pull request #10685 from Discover-/SmartAI-Target-Casting 
Core/SmartAI: Add a spellid to SMART_EVENT_TARGET_CASTING. If left on 0,...
 2013-09-01 10:03:45 -07:00
Nay
c4bd91ceb9 Merge pull request #10690 from Discover-/SmartAI-Set-Home-Pos 
Core/SAI: Allow using SMART_ACTION_SET_HOME_POS with multiple target typ...
 2013-09-01 10:03:09 -07:00
Nay
b324646005 Merge pull request #10689 from Discover-/SmartAI-Killed-Monster-Credit 
Core/SAI: Also use loot recipient for SMART_ACTION_CALL_KILLEDMONSTER wh...
 2013-09-01 10:02:43 -07:00
Nay
a762df0aba Core/SAI: Fix processing linked events when return is used in ProcessAction 
Thanks Discover-

Closes #10688
 2013-09-01 18:01:59 +01:00
jackpoz
e1e1067d17 Core/Thread: Fix race condition in FreezeDetectorRunnable 
Fix race condition by replacing a static volatile uint32 with proper atomic thread-safe ACE_Atomic_Op<ACE_Thread_Mutex, uint32>, incremented in WorldRunnable::run() at each world loop and read in FreezeDetectorRunnable::run().

Helgrind log:
 Possible data race during read of size 4 at 0x2400D54 by thread #12
 Locks held: none
    at 0x100FEA6: FreezeDetectorRunnable::run() (Master.cpp:106)
    by 0x1637892: ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186)
    by 0x518F555: ACE_OS_Thread_Adapter::invoke() (OS_Thread_Adapter.cpp:103)
    by 0x4C2B5AD: mythread_wrapper (hg_intercepts.c:219)
    by 0x61DAB4F: start_thread (pthread_create.c:304)
    by 0x6C69A7C: clone (clone.S:112)

 This conflicts with a previous write of size 4 by thread #9
 Locks held: none
    at 0x100C23E: WorldRunnable::run() (WorldRunnable.cpp:55)
    by 0x1637892: ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186)
    by 0x518F555: ACE_OS_Thread_Adapter::invoke() (OS_Thread_Adapter.cpp:103)
    by 0x4C2B5AD: mythread_wrapper (hg_intercepts.c:219)
    by 0x61DAB4F: start_thread (pthread_create.c:304)
    by 0x6C69A7C: clone (clone.S:112)
 2013-09-01 18:49:49 +02:00
Shauren
6b60877e3e Core/NetworkIO: Fixed memory leak 2013-09-01 17:48:47 +02:00
Discover-
8ba8190773 Core/SAI: Allow using SMART_ACTION_SET_HOME_POS with multiple target types 2013-09-01 13:56:35 +02:00
Discover-
7d7fc7b662 Core/SAI: Also use loot recipient for SMART_ACTION_CALL_KILLEDMONSTER when target is SMART_TARGET_SELF (used in four cases in a clean TDB which will be fixed by this) 2013-09-01 13:44:08 +02:00
joschiwald
e526e14d7e Core/Scripts: fix build 2013-09-01 13:43:56 +02:00
joschiwald
5c5b78c77c Scripts/Ulduar: fix mark of the faceless and add missing door handling 2013-09-01 13:25:52 +02:00
Discover-
016dac995e Core/SmartAI: Add a spellid to SMART_EVENT_TARGET_CASTING. If left on 0, it checks for all spells (like it did without these changes) 2013-09-01 10:49:29 +02:00
Vincent-Michael
27bc3b1751 Core/Creatures: Added error log for SPELL_AURA_CONTROL_VEHICLE auras in creature_addon / creature_template_addon 2013-09-01 02:21:04 +02:00
Shauren
d6fdd05493 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-09-01 00:59:58 +02:00
Machiavelli
eab035eca6 Revert e6761ea2aa 2013-08-31 21:25:53 +01:00
Nay
16fcac1991 Core/RBAC: Move bf commands to RBAC (using individual permissions) 2013-08-31 21:02:14 +01:00
Vincent-Michael
6c8d0e5405 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-31 21:52:15 +02:00
Machiavelli
e6761ea2aa Core/NetworkIO: Fix memory leak 
Packet headers not being correctly deallocated.
 2013-08-31 18:56:58 +01:00
Vincent-Michael
22b71244a0 DB/Creature: Fix cords for quest "Death Comes From On High" 2013-08-31 19:33:14 +02:00
Vincent-Michael
e753a47162 DB/Sai: Fix quest credit for quest "Blessing of Incineratus" 2013-08-31 18:29:51 +02:00
Vincent-Michael
8fd1f46192 Scripted: Fix warning 2013-08-31 17:52:47 +02:00
Vincent-Michael
b1721a65ee Core/Spells: Fix quest credit for quest "Death Comes From On High" 2013-08-31 17:42:04 +02:00
joschiwald
ae36ddefec Core/Scripts: add creature_text to pet mojo 
Scripts/Karazhan/Moroes: cleanup a bit (should fixes mem leak)
 2013-08-31 16:48:37 +02:00
Vincent-Michael
38bb6fe8e7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
 2013-08-30 23:46:24 +02:00
Vincent-Michael
3f6296b65e Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-08-30 23:09:01 +02:00
Nay
7ecf4fdec1 Core/Quests: Split Flags and SpecialFlags 2013-08-30 23:08:40 +02:00
Shauren
16eefd18fa Scripts/Icecrown Citaldel: Fixed spells cast by Professor Putricide during heroic Festergut and Rotface encounters 
Closes #7641
Closes #8243
 2013-08-30 23:00:43 +02:00
Machiavelli
4b5c4ab12a Core/CharacterHandler: Some more rules for CMSG_CHAR_ENUM allowance 
Thanks to @TakenBacon for heads up
 2013-08-30 21:52:59 +01:00
jackpoz
be7d82ba8d Core/Maps: Fix Spline triggered assert 
Fix an assert triggered by float to int32 cast overflowing to -1, now it replaces -1 with max int32 value.
Fix another assert triggered by Vector3 magnitude float overflow to max/infinity in StaticMapTree::isInLineOfSight(), in this case return false.

Both asserts can be reproduced by casting Mind Control to a NPC, tele to z: 1.0e+38 using client hack tools, move to allow the server to register the new position and stop Mind Control.

Closes #8970
Closes #10578
Closes #10355
Closes #10673
 2013-08-30 21:27:04 +01:00
Machiavelli
e3f27a36fe Core/Creatures: Fix base stats calculations for some cases. 
i.e. health_mod of 0.001 resulting in hp of 0 instead of 1
 2013-08-30 20:59:29 +01:00
Vincent-Michael
224c5c5d3d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-08-30 21:43:02 +02:00
Vincent-Michael
87e105c818 Core: Fix warning 2013-08-30 20:56:41 +02:00
Nay
7776016106 Core/Quests: Remove CastedCreatureOrGO method 
- Remove EAI's ACTION_T_CAST_EVENT and ACTION_T_CAST_EVENT_ALL
- Remove SAI's SMART_ACTION_CALL_CASTEDCREATUREORGO
- Split QUEST_TRINITY_FLAGS_KILL_OR_CAST into QUEST_TRINITY_FLAGS_KILL and QUEST_TRINITY_FLAGS_CAST
- Assign QUEST_TRINITY_FLAGS_CAST to all the quests that were using RequiredSpellCastX
- (unrelated) Fix a warning in Player.cpp
- Replace CastedCreatureOrGO usage in scripts by KilledMonsterCredit

TODO: Convert the two EAI scripts commented out in the .sql to proper SAI

Closes #10667
 2013-08-30 19:32:08 +01:00
Nay
aa5bc37e9c Core: Yet more warning fixes 2013-08-30 16:03:37 +01:00
Nay
1903d4ca7d Core/Server: Fix a spammy warning in WorldSession and move code to .cpp 2013-08-30 15:44:17 +01:00
Spp
9bea4fc451 Core/RBAC: Move ban commands to RBAC (using individual permissions) 2013-08-30 16:26:52 +02:00
Spp
2b69f83823 Core/RBAC: Move Achievements and Arena commands to RBAC (using individual permissions) 2013-08-30 16:14:00 +02:00
Spp
109188a203 Core/RBAC: Move account commands to RBAC (using individual permissions) 2013-08-30 15:53:29 +02:00
Spp
ea26928a99 Core/RBAC: Move RBAC commands to RBAC using individual permissions 
- Use this commit as a sample on how to move commands to RBAC
 2013-08-30 14:52:53 +02:00
Spp
3232b69ff3 Core/RBAC: Move commands security to RBAC (using generic RBAC Permissions) 
- Warning: This will break commands for any custom security level
 2013-08-30 13:57:09 +02:00
Nay
ec837b1d7d Merge pull request #10666 from xjose93/SmartScripts-StartEvent 
Implement SMART_ACTION_GAME_EVENT_STOP (111) and SMART_ACTION_GAME_EVENT_START (112).
 2013-08-29 16:36:42 -07:00
xjose93
c3afc00571 Implement SMART_ACTION_GAME_EVENT_STOP (111) and SMART_ACTION_GAME_EVENT_START (112). 2013-08-30 01:23:01 +02:00
Machiavelli
213998e2d7 Core/NetworkIO: Allow CMSG_CHAR_ENUM after char creation and char deletion 
Perhaps these calls could be better placed but it's a matter of trial
and error to see what is most effective.
 2013-08-30 00:05:57 +01:00
Machiavelli
9346695129 Core: Few fixes for previous commit. 2013-08-29 21:55:29 +01:00
Vincent-Michael
aa0b910122 Core/Quest: Fix typo in 738a781468 2013-08-29 21:28:32 +02:00