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
19,928 Commits 4 Branches 146 Tags
d84bdcc1d0facec3e73bf84ca22ecc29d3bbf610
Commit Graph

19928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aokromes
d84bdcc1d0 DB/Misc: Lunar Festival Invitation - Teleport Moonglade 
by zaphod77, updates #4945
 2013-11-03 06:14:05 +01:00
Aokromes
2dd80b813e DB/Misc: Heart of the Phoenix Cooldown must ignore LoS 
By mweinelt, updates #10198
 2013-11-03 05:55:13 +01:00
Aokromes
8726c4dca2 DB/Gameobject: Battle plans of the Kvaldir 
By Justiciar, closes #10291
 2013-11-03 05:48:22 +01:00
Aokromes
1d31b5f4a7 DB/SAI: Book of the Ancients 
By dr-j, closes #10146
 2013-11-03 05:40:52 +01:00
Aokromes
51dd1ebd4e DB/Misc: Argent tournament quests without progress 
By Crysicle, closes #7988
 2013-11-03 05:36:29 +01:00
Aokromes
6843734b8f DB/SAI: There's Something Going On In Those Caves 
By dr-j, closes #10786
 2013-11-03 05:13:36 +01:00
Aokromes
73533f646f DB/SAI: Boiling Point 
By untaught, closes #10761
 2013-11-03 05:10:19 +01:00
Aokromes
6eac86a26f DB/Quest: A Dark Influence 
By wintergreen77, fixes #6777
 2013-11-03 04:51:26 +01:00
Aokromes
0cd02caaa8 DB/Misc: Kyle the friendly 
By dr-j, closes #10564
 2013-11-03 04:29:50 +01:00
Aokromes
2125c572e0 DB/Misc: Required classes for all versions of The Purification of Quel'Delar 
By dr-j, closes #10594
 2013-11-03 04:23:58 +01:00
Aokromes
6f9a548bd6 DB/SAI: Still At It 
By dr-j, closes #8008
 2013-11-03 04:01:08 +01:00
Aokromes
13df07e8fa DB/Creature: Scalesworn Elite inhabittype 
By untaught, closes #10831
 2013-11-03 03:54:55 +01:00
Aokromes
d42fe0c9a9 DB/SAI: Fix more credit fixes 
By Pitcrawler, closes #10022
 2013-11-03 03:49:40 +01:00
Aokromes
27a4e48771 DB/Conditions: Skill requirements to ride flying carpets and flying machines 
By dr-j, closes #10572
 2013-11-03 03:43:53 +01:00
Aokromes
d9a1609501 DB/Gameobject: Ulduar Flame Leviatan secondary force field 
By PanDaemonAeon, closes #4793
 2013-11-03 03:19:35 +01:00
Aokromes
1efb60c78e DB/Misc: Remove spells with effects SPELL_EFFECT_SUMMON 
By xjose93, closes #7653 closes #10212
 2013-11-03 02:54:06 +01:00
Aokromes
10d20fdcd0 DB/Creature: IoC template updates 
By milotic, closes #8591
 2013-11-03 02:22:49 +01:00
Aokromes
3c0228f609 DB/Gameobject: Dip in the Moonwell 
By untaught, closes #7523
 2013-11-03 01:44:52 +01:00
Aokromes
336885480d DB/SAI: Fix more credit fixes 
By dr-j, closes #10872
 2013-11-03 01:01:31 +01:00
Aokromes
8ed82d08fd DB/SAI: Surveying the Ruins 
By Polkic, closes #11162
 2013-11-03 00:52:11 +01:00
jackpoz
6d794ab305 Core/Database: Add additional assert 
Add additional assert to assure that helgrind reports related to SQLQueryHolderTask::Execute() and WorldSession::ProcessQueryCallbacks() are false positives.
The only chance for WorldSession::ProcessQueryCallbacks() to access the SQL queries before they are completed is if m_result.ready() is true before the end of SQLQueryHolderTask::Execute() .

Helgrind false positive log:
 Possible data race during read of size 8 at 0x2BD641E0 by thread #7
 Locks held: none
    at : SQLQueryHolder::GetPreparedResult(unsigned long) (QueryHolder.cpp:107)
    by : Player::LoadFromDB(unsigned int, SQLQueryHolder*) (Player.cpp:16917)
    by : WorldSession::HandlePlayerLogin(LoginQueryHolder*) (CharacterHandler.cpp:807)
    by : WorldSession::ProcessQueryCallbacks() (WorldSession.cpp:1112)
    by : WorldSession::Update(unsigned int, PacketFilter&) (WorldSession.cpp:401)
    by : World::UpdateSessions(unsigned int) (World.cpp:2646)
    by : World::Update(unsigned int) (World.cpp:2003)
    by : WorldRunnable::run() (WorldRunnable.cpp:60)
    by : ACE_Based::Thread::ThreadTask(void*) (Threading.cpp:186)
    by : ACE_OS_Thread_Adapter::invoke() (in /usr/lib/libACE-6.0.3.so)
    by : mythread_wrapper (hg_intercepts.c:233)
    by : start_thread (pthread_create.c:311)

 This conflicts with a previous write of size 8 by thread #4
 Locks held: none
    at : SQLQueryHolder::SetPreparedResult(unsigned long, PreparedResultSet*) (QueryHolder.cpp:140)
    by : SQLQueryHolderTask::Execute() (QueryHolder.cpp:196)
    by : SQLOperation::call() (SQLOperation.h:65)
    by : DatabaseWorker::svc() (DatabaseWorker.cpp:45)
    by : ACE_Task_Base::svc_run(void*) (in /usr/lib/libACE-6.0.3.so)
    by : ACE_Thread_Adapter::invoke_i() (in /usr/lib/libACE-6.0.3.so)
    by : ACE_Thread_Adapter::invoke() (in /usr/lib/libACE-6.0.3.so)
    by : mythread_wrapper (hg_intercepts.c:233)

 Address 0x2BD641E0 is 16 bytes inside a block of size 792 alloc'd
    at : operator new(unsigned long) (vg_replace_malloc.c:319)
    by : __gnu_cxx::new_allocator<std::pair<SQLElementData, SQLResultSetUnion> >::allocate(unsigned long, void const*) (new_allocator.h:104)
    by : std::_Vector_base<std::pair<SQLElementData, SQLResultSetUnion>, std::allocator<std::pair<SQLElementData, SQLResultSetUnion> > >::_M_allocate(unsigned long) (in /home/jackpoz/trinity/bin/worldserver)
    by : std::vector<std::pair<SQLElementData, SQLResultSetUnion>, std::allocator<std::pair<SQLElementData, SQLResultSetUnion> > >::_M_fill_insert(__gnu_cxx::__normal_iterator<std::pair<SQLElementData, SQLResultSetUnion>*, std::vector<std::pair<SQLElementData, SQLResultSetUnion>, std::allocator<std::pair<SQLElementData, SQLResultSetUnion> > > >, unsigned long, std::pair<SQLElementData, SQLResultSetUnion> const&) (vector.tcc:483)
    by : std::vector<std::pair<SQLElementData, SQLResultSetUnion>, std::allocator<std::pair<SQLElementData, SQLResultSetUnion> > >::insert(__gnu_cxx::__normal_iterator<std::pair<SQLElementData, SQLResultSetUnion>*, std::vector<std::pair<SQLElementData, SQLResultSetUnion>, std::allocator<std::pair<SQLElementData, SQLResultSetUnion> > > >, unsigned long, std::pair<SQLElementData, SQLResultSetUnion> const&) (stl_vector.h:1024)
    by : std::vector<std::pair<SQLElementData, SQLResultSetUnion>, std::allocator<std::pair<SQLElementData, SQLResultSetUnion> > >::resize(unsigned long, std::pair<SQLElementData, SQLResultSetUnion>) (stl_vector.h:707)
    by : SQLQueryHolder::SetSize(unsigned long) (QueryHolder.cpp:167)
    by : LoginQueryHolder::Initialize() (CharacterHandler.cpp:66)
    by : WorldSession::HandlePlayerLoginOpcode(WorldPacket&) (CharacterHandler.cpp:788)
    by : WorldSession::Update(unsigned int, PacketFilter&) (WorldSession.cpp:363)
    by : World::UpdateSessions(unsigned int) (World.cpp:2646)
    by : World::Update(unsigned int) (World.cpp:2003)
 2013-11-02 22:57:07 +01:00
Shauren
ca34b701cb Core/Transports: Fixed a few mistakes in GO passenger teleports (currently unused), thanks joschiwald for spotting them 2013-11-02 16:33:39 +01:00
Gacko
62c6ae7660 Tools: Skip extracting already existing DBC files 
Thanks to MacWarrior, closes #11061
 2013-11-02 14:07:54 +01:00
Shauren
0ee3093536 Fixed typo in 39175ac680 2013-11-02 13:46:10 +01:00
Shauren
39175ac680 Core/Transports 
* Fixed fall damage on transports while teleporting
* Fixed packets not being received by owner if sent by a controlled minion
* Fixed an issue when a teleporting transport would attempt to reload its creature passengers on old map

Closes #11140
 2013-11-02 13:22:14 +01:00
Aokromes
8d15c4c743 DB/Misc: Correct some game event data 
By Foldor, closes #10960
 2013-11-02 10:10:48 +01:00
Aokromes
15efc1e30f DB/Loot: Voidwalker Minions are not meant to drop loot 
By dr-j and Exodius closes #11012
 2013-11-02 10:01:36 +01:00
Aokromes
a61872ac27 DB/Misc: Neltharaku 
By untaught, closes #11031
 2013-11-02 09:54:36 +01:00
Aokromes
5b404ec279 DB/SAI: Slaves of the Stormforged 
By untaught, closes #10509
 2013-11-02 09:00:22 +01:00
Aokromes
8576360360 DB/SAI: Sprouted Frond 
By untaught, closes #11123
 2013-11-02 08:57:01 +01:00
Aokromes
4355d55acd DB/Misc: Quest item "Drain Schematics" drop 
By trickerer, fixes #10394
 2013-11-02 08:52:20 +01:00
Aokromes
c04109047e DB/Misc: Fixes 2 innkeepers of Hallow's End event 
By dr-j and untaught, closes #11108
 2013-11-02 08:48:13 +01:00
Aokromes
f95769eb56 DB/Misc: Make invisible some visible Triggers 
By untaught, closes #10648
 2013-11-02 08:42:42 +01:00
Filip
3d5a317b75 DB/SAI: Dragonmaw Sky Stalker 
By @MitchesD fixes #11148
 2013-10-28 21:14:35 +01:00
jackpoz
f002b0552b Core/Vehicles: Add missing NULL check in cf72f7cc5c 
Add an additional NULL check for me->GetVehicleKit() , otherwise the crash fixed in cf72f7cc5c becomes a NULL dereference crash.
 2013-10-28 20:32:56 +01:00
Aokromes
f81316a5eb Merge pull request #11147 from LeGuybrush/master 
Core/Code: Unify [more] codestyle for brackets: )\n{\n} to ) { }.
 2013-10-28 12:19:13 -07:00
leguybrush
0a308144a8 Core/Code: Unify [more] codestyle for brackets: )\n{\n} to ) { }. 2013-10-28 14:36:07 -04:00
Aokromes
5cfd180247 Merge pull request #11138 from Ascathor/master 
Core/Code: Unify codestyle for brackets: {} to { }.
 2013-10-28 09:57:48 -07:00
Ascathor
7a7ad4a60a Core/Code: Adding copyright to all the mesh_extractor files. 2013-10-27 23:56:58 +01:00
Ascathor
2607738990 Core/Code: Unify codestyle for brackets: {} to { }. 
Also added missing copyright to some files.
 2013-10-27 23:46:02 +01:00
Shauren
cf72f7cc5c Core/Vehicles: Fixed a crash caused by accessing freed memory 
Valgrind log:
==1357== Invalid read of size 8
==1357== at 0x108339C: std::_Rb_tree<signed char, std::pair<signed char const, VehicleSeat>, std::_Select1st<std::pair<signed char const, VehicleSeat> >, std::less<signed char>, std::allocator<std::pair<signed char const, VehicleSeat> > >::begin() (stl_tree.h:685)
==1357== by 0x1082B23: std::map<signed char, VehicleSeat, std::less<signed char>, std::allocator<std::pair<signed char const, VehicleSeat> > >::begin() (stl_map.h:321)
==1357== by 0x1567152: VehicleAI::CheckConditions(unsigned int) (CombatAI.cpp:330)
==1357== by 0x1566EE5: VehicleAI::UpdateAI(unsigned int) (CombatAI.cpp:285)
==1357== by 0x11A8FB3: Creature::Update(unsigned int) (Creature.cpp:543)
==1357== by 0x11BC1A2: TempSummon::Update(unsigned int) (TemporarySummon.cpp:47)
==1357== by 0x12E8194: Trinity::ObjectUpdater::Visit(GridRefManager<Creature>&) (GridNotifiersImpl.h:45)
==1357== by 0x12F31BD: void VisitorHelper<Trinity::ObjectUpdater, Creature>(Trinity::ObjectUpdater&, ContainerMapList<Creature>&) (TypeContainerVisitor.h:64)
==1357== by 0x12F2CCB: void VisitorHelper<Trinity::ObjectUpdater, Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > >(Trinity::ObjectUpdater&, ContainerMapList<TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > >&) (TypeContainerVisitor.h:70)
==1357== by 0x12F251F: void VisitorHelper<Trinity::ObjectUpdater, GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > >(Trinity::ObjectUpdater&, ContainerMapList<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > >&) (TypeContainerVisitor.h:71)
==1357== by 0x12F1BA5: void VisitorHelper<Trinity::ObjectUpdater, TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > >(Trinity::ObjectUpdater&, TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > >&) (TypeContainerVisitor.h:94)
==1357== by 0x12F0DDD: TypeContainerVisitor<Trinity::ObjectUpdater, TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > > >::Visit(TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > >&) (TypeContainerVisitor.h:105)
==1357== by 0x12EF5A0: void Grid<Player, TypeList<Player, TypeList<Creature, TypeList<Corpse, TypeList<DynamicObject, TypeNull> > > >, TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > >::Visit<Trinity::ObjectUpdater>(TypeContainerVisitor<Trinity::ObjectUpdater, TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > > >&) (Grid.h:91)
==1357== by 0x12ED766: void NGrid<8u, Player, TypeList<Player, TypeList<Creature, TypeList<Corpse, TypeList<DynamicObject, TypeNull> > > >, TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > >::VisitGrid<Trinity::ObjectUpdater, TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > >(unsigned int, unsigned int, TypeContainerVisitor<Trinity::ObjectUpdater, TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > > >&) (NGrid.h:157)
==1357== by 0x12EA2D3: void Map::Visit<Trinity::ObjectUpdater, TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > > >(Cell const&, TypeContainerVisitor<Trinity::ObjectUpdater, TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > > >&) (Map.h:701)
==1357== by 0x12DCD84: Map::VisitNearbyCellsOf(WorldObject*, TypeContainerVisitor<Trinity::ObjectUpdater, TypeMapContainer<TypeList<GameObject, TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > > > >&, TypeContainerVisitor<Trinity::ObjectUpdater, TypeMapContainer<TypeList<Player, TypeList<Creature, TypeList<Corpse, TypeList<DynamicObject, TypeNull> > > > > >&) (Map.cpp:604)
==1357== by 0x12DD045: Map::Update(unsigned int) (Map.cpp:646)
==1357== by 0x1520E03: MapUpdateRequest::call() (MapUpdater.cpp:54)
==1357== by 0x1596958: DelayExecutor::svc() (DelayExecutor.cpp:52)
==1357== by 0x5184E56: ACE_Task_Base::svc_run(void*) (in /usr/lib/libACE-6.0.3.so)
==1357== Address 0x2a849600 is 32 bytes inside a block of size 168 free'd
==1357== at 0x4C2BADC: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1357== by 0x107F309: Vehicle::~Vehicle() (Vehicle.cpp:66)
==1357== by 0x10BE0D2: Unit::RemoveVehicleKit() (Unit.cpp:15949)
==1357== by 0x10B52CA: Unit::RemoveFromWorld() (Unit.cpp:13440)
==1357== by 0x11A7D73: Creature::RemoveFromWorld() (Creature.cpp:204)
==1357== by 0x11BCBAA: TempSummon::RemoveFromWorld() (TemporarySummon.cpp:279)
==1357== by 0x11BCD5E: Minion::RemoveFromWorld() (TemporarySummon.cpp:308)
==1357== by 0x10B5514: Unit::CleanupBeforeRemoveFromMap(bool) (Unit.cpp:13481)
==1357== by 0x10B5605: Unit::CleanupsBeforeDelete(bool) (Unit.cpp:13503)
==1357== by 0x12E3B67: Map::AddObjectToRemoveList(WorldObject*) (Map.cpp:2401)
==1357== by 0x10FCAAC: WorldObject::AddObjectToRemoveList() (Object.cpp:2138)
==1357== by 0x11BCABA: TempSummon::UnSummon(unsigned int) (TemporarySummon.cpp:256)
==1357== by 0x11BCAFA: ForcedUnsummonDelayEvent::Execute(unsigned long, unsigned int) (TemporarySummon.cpp:261)
==1357== by 0x159B665: EventProcessor::Update(unsigned int) (EventProcessor.cpp:47)
==1357== by 0x10858E2: Unit::Update(unsigned int) (Unit.cpp:318)
==1357== by 0x11A8E6C: Creature::Update(unsigned int) (Creature.cpp:519)
==1357== by 0x11BC1A2: TempSummon::Update(unsigned int) (TemporarySummon.cpp:47)
==1357== by 0x12E8194: Trinity::ObjectUpdater::Visit(GridRefManager<Creature>&) (GridNotifiersImpl.h:45)
==1357== by 0x12F31BD: void VisitorHelper<Trinity::ObjectUpdater, Creature>(Trinity::ObjectUpdater&, ContainerMapList<Creature>&) (TypeContainerVisitor.h:64)
==1357== by 0x12F2CCB: void VisitorHelper<Trinity::ObjectUpdater, Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > >(Trinity::ObjectUpdater&, ContainerMapList<TypeList<Creature, TypeList<DynamicObject, TypeList<Corpse, TypeNull> > > >&) (TypeContainerVisitor
 2013-10-27 23:05:31 +01:00
Subv
29570076d5 Merge pull request #11137 from Ascathor/master 
Core/Command: Fix ban info order for .pinfo
 2013-10-27 12:41:46 -07:00
Ascathor
e5553cfb78 Core/Command: Fix ban info order for .pinfo 2013-10-27 20:38:33 +01:00
Filip
fa33c428e9 DB/Cond: Prevent multiple spawns in vicinity 
By @dr-j fixes #11128
 2013-10-27 19:15:57 +01:00
Shauren
f0794d7585 Core/Transports: Correct path generation for a few transports 2013-10-27 11:15:56 +01:00
Shauren
b81bf7d025 Core/Spells: Implemented additional conditions for spells that start cooldown after an event instead of after cast 2013-10-26 14:39:00 +02:00
jackpoz
daf5a4b5c3 Core/Chat Commands: Allow to add overlapping teles . 
Allow to add overlapping teles like "abc" even if "abcde" already exists. This wasn't possible and a "Teleport already exists" error was thrown instead.
 2013-10-25 21:50:52 +02:00
Subv
a14bbf773e Merge pull request #11120 from AliveShiro/battlefield_cosmetic 
Game/Battlefield: Cosemtic changes
 2013-10-25 09:06:57 -07:00
AliveShiro
cc89ac0be3 Game/Battlefield: 
- Remove double definition of one NPC
- Use definition instead a "magic number"
 2013-10-25 17:30:24 +02:00
Filip
5e62edd7c9 Db/Update: Rockjaw Backbreaker script spam 
By @untaught fixes #11112
 2013-10-25 15:52:26 +02:00