Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,535 Commits 4 Branches 146 Tags
ed6f3e2deff55f913f9646db5f540b7704088478
Commit Graph

501 Commits

Author SHA1 Message Date
Shauren
ed6f3e2def Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x 2012-07-04 22:20:21 +02:00
Shauren
c8d20004a5 Core: Minor code style corrections 2012-06-30 16:07:09 +02:00
Shauren
e0997874f5 Core/SpellScripts: Changed OnUnitTargetSelect hook to OnObjectAreaTargetSelect, it will now work with WorldObject instead of only Units and call it even for empty target lists 2012-06-29 21:53:35 +02:00
Shauren
c7775c8d72 Core/Maps: Moved object respawn time storage from global to map level. This removes unneccessary locking since all objects run within its map's thread. 2012-06-07 23:20:57 +02:00
Nay
8fa351b786 Core/DBLayer: Fix some errors with character DB prepared statements 2012-05-30 14:18:28 +01:00
kaelima
774f3cdc9b Fixed some merging errors, there could be more, but at least it compiles. 2012-05-30 09:22:56 +02:00
kaelima
3d14384c32 Merge git://github.com/TrinityCore/TrinityCore into 4.x 
Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt
 2012-05-30 08:01:02 +02:00
Shauren
024a39af9f Core: Tweaked ASSERT macro a bit - removed library assert as on Windows platforms it calls abort() and does not generaty crash dump files. 2012-05-12 21:11:41 +02:00
kaelima
f34e650fe0 Core/Accounts: Delete all bans related to an account when it has been deleted. 2012-05-06 02:37:31 +02:00
kaelima
7f51c399c6 Core/DBLayer: CHAR_DEL_CHAR_AURA_FROZEN query should be asynchronous 
Closes issue #6273

Also corrected one opcode name in Opcodes.cpp (changes nothing)
 2012-04-30 02:07:59 +02:00
Shauren
5c3ee06f49 Core/Errors: Improved OS detection for windows crash reporting 2012-04-21 16:29:26 +02:00
Shauren
c055a8617d Scripts/Icecrown Citadel 
* Fixed Professor Putricide Tear Gas stunning himself
* Fixed visual of Unstable Experiment
* Fixed oozes not picking new targets after hitting old
* Fixed Gas Cloud not using melee attack
* Removed ooze summon position hack

Closes #4301
Closes #2726
Closes #5119
Closes #4464
Closes #2874
Closes #4407
Closes #2421
Closes #4899
 2012-04-13 19:56:00 +02:00
Shauren
7405202023 Removed unused file 2012-04-12 15:44:41 +02:00
faramir118
f9ae8e6810 Core/DBLayer: incorrect use of va_start 
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
 2012-04-11 19:51:26 +02:00
kaelima
3dabe220ce Cmake: Remove no longer existing */dep/mersennetwister include 
Thanks Venugh for noticing
 2012-04-09 16:03:22 +02:00
kaelima
7f903edcd9 Core/DBLayer: Fix two crashes when using pdump command 
Closes #6107
 2012-04-09 03:33:46 +02:00
Machiavelli
9d6c8add0e Fix non-PCH build and GitExtensions screwup from last changeset 2012-04-08 18:58:42 +02:00
Machiavelli
bc96df1aae Core/Shared: Move container functions to shared project under Trinity::Container namespace. Also implement RandomResizeList which takes a predicate function as parameter. 
Core/ScriptedAI: Extend SummonList::DoAction to take a predicate function as parameter and allow specifying a maximum number of units to be selected.
 2012-04-08 17:40:05 +02:00
Nay
3d83f663f6 Core/Tickets: Add report time and current latency to lag_reports table 
It's a tiny bit more useful now.
 2012-04-07 19:12:14 +01:00
Nay
d546a531c3 Core&DB/Spells: Fix DK T8 4p bonus 
- Added missing spell to DB
- Corrected DBC data that is, very likely, wrong
Closes #6062
 2012-04-06 18:49:40 +01:00
Shauren
d9451cedd8 Core/World: Add character name data after loading PlayerDump 
Closes #3653

Note: Manual changes in database while the server is running are not advised thus not supported
 2012-04-03 00:02:58 +02:00
kaelima
ede839dd97 Core/Database: Some extended debug output for Field::GetXXX logs. 2012-04-02 03:30:19 +02:00
Nay
b7f7e3118c Core/DBLayer: More type fixes 
Thanks to Vasago for the help in spotting the errors
Thanks to Subv as well (so he doesn't feel lonely)
 2012-04-01 22:41:47 +01:00
Nay
91c7b5d2ca Core/DBLayer: Delete a triplicated prepared statement (LoginDatabase) 
Thanks to Anubiss for spotting it
 2012-03-31 15:48:40 +01:00
Nay
c71f75e9ca Core/Logging: Fix a typo in DebugLogFilters - Database & AI 
Thanks to Garthog for finding it
 2012-03-31 15:13:56 +01:00
Shauren
68fdf2a12f Core/DBLayer: Added missing prepared statement implementation for uint8/16 2012-03-31 14:16:48 +02:00
Shocker
b292437989 Merge pull request #5933 from GyxTom/master 
Core/Misc: Code style and remove unused define
 2012-03-30 14:49:44 -07:00
Shauren
5843851559 Core/DBLayer: More prepared statement corrections 2012-03-29 23:22:10 +02:00
Gyx
5b7493fc66 Core/Misc: Code style and remove unused define. 
Signed-off-by: Gyx <2359980687@qq.com>
 2012-03-29 14:43:34 +08:00
leak
7309ee5621 SQL: Auth db data type cleanup logs, realmcharacters, realmlist, uptime / Storage engine switched to InnoDB Note: 
As for the redundant `uptime`.`startstring` being removed, this page might be of interest how to generate time strings from unix timestamps
http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_from-unixtime
 2012-03-28 19:46:38 +02:00
click
6237ddac34 Partially revert a36a0a77ef. 
Cleaning databases for old/deprecated and expired quests should never be a
developers choice specifically. This should be done by admins, not developers,
through the use of the already existing paramters found in the worldserver config :
CleanCharacterDB / PersistentCharacterCleanFlags

An adjustment to the respective questloader prepared statement has been done to
accomodate for the earlier change (by not loading such quests into memory at all).

Documentation for how this cleanup-procedures work already exists in the core :
doc/CharacterDBCleanup.txt.
 2012-03-28 19:31:06 +02:00
Machiavelli
1ee7196ec0 Core/DB Layer: Fix helgrind errors on some concurrent access to resultset auto pointers. 
Example:
==8753== Possible data race during read of size 8 at 0x2e803e60 by thread #8
==8753==    at 0xDD0FFC: PreparedResultSet::operator[](unsigned int) const (QueryResult.h:83)
==8753==    by 0x131D82D: WorldSession::HandleCharEnum(Trinity::AutoPtr<PreparedResultSet, ACE_Null_Mutex>) (CharacterHandler.cpp:217)
==8753==    by 0x118F8C3: WorldSession::ProcessQueryCallbacks() (WorldSession.cpp:1087)
{..}
==8753==  Address 0x2e803e60 is 0 bytes inside a block of size 16 alloc'd
==8753==    at 0x4C28B75: operator new(unsigned long) (vg_replace_malloc.c:261)
==8753==    by 0x137D515: __gnu_cxx::new_allocator<Field*>::allocate(unsigned long, void const*) (new_allocator.h:92)
==8753==    by 0x137D378: std::_Vector_base<Field*, std::allocator<Field*> >::_M_allocate(unsigned long) (in /home/aokromes/bin/bin/worldserver)
==8753==    by 0x137CEC6: std::vector<Field*, std::allocator<Field*> >::_M_fill_insert(__gnu_cxx::__normal_iterator<Field**, std::vector<Field*, std::allocator<Field*> > >, unsigned long, Field* const&) (vector.tcc:416)
==8753==    by 0x137CB27: std::vector<Field*, std::allocator<Field*> >::insert(__gnu_cxx::__normal_iterator<Field**, std::vector<Field*, std::allocator<Field*> > >, unsigned long, Field* const&) (stl_vector.h:944)
==8753==    by 0x137C964: std::vector<Field*, std::allocator<Field*> >::resize(unsigned long, Field*) (stl_vector.h:632)
==8753==    by 0x137BFCA: PreparedResultSet::PreparedResultSet(st_mysql_stmt*, st_mysql_res*, unsigned long, unsigned int) (QueryResult.cpp:98)
==8753==    by 0x137A12B: MySQLConnection::Query(PreparedStatement*) (MySQLConnection.cpp:493)
==8753==    by 0x137F663: PreparedStatementTask::Execute() (PreparedStatement.cpp:412)

Have a feeling this is a false positive, though. Nevertheless good to get rid of.
 2012-03-27 13:33:02 +03:00
Machiavelli
88d81d27cf Core/DB Layer: - Fix "Thread #1 unlocked a not-locked lock at 0x6D56E90" helgrind error (thanks to Aokromes for logs). Cause was unlocking MySQL connection on shutdown, but concurrent access at this point is not required. 
- Remove redundant locking in PingOperation. Since these are delayed to async threads with their own MySQL connection, no concurrent access here either.
- Codestyle cleanup
- Documentation refining
 2012-03-27 11:50:03 +02:00
click
6afaed4a02 Core: Remove the MersenneTwiser-library (SFMT is now considered stable enough for full deployment) 2012-03-27 02:27:12 +02:00
leak
830a7fb08b Core/DBLayer: Restore pet loading 
closes #5878
 2012-03-26 18:58:24 +02:00
leak
b1ca1ee5ec Core/DBLayer: Convert PAppend() queries to prepared statements No.4 NOTE: 
Most of the cores queries have been converted to prepared statements now. If your code contains queries, please either use the exiting or implement new statements.
The only exclusions are one-time queries (e.g. for core startup) and queries that can't be prepared due to limitations.
 2012-03-26 15:47:37 +02:00
Machiavelli
e960016dc4 Partial revert of "Core/DB Layer: Fix a memory leak.", mysql library related stuff. Original memory leak fix is still in place. 2012-03-26 13:33:47 +02:00
Machiavelli
70ee37f3b4 Core/DB Layer: Fix a memory leak for synchronously executed prepared statements. 2012-03-26 08:58:21 +02:00
Machiavelli
43048afc7e Core/DB Layer: Fix a memory leak. 2012-03-26 08:29:41 +02:00
kaelima
19f821d00a Auth/Realmlist: Make use of RealmFlags and rename color to flag (core- and dbwise) 
Also fix connecting with realmflag & 4
 2012-03-26 05:14:10 +02:00
Machiavelli
3f61bd0a26 Core/DB Layer: Make SQLTransaction AutoPtr thread safe (valgrind caught a race condition) 2012-03-26 02:56:43 +03:00
Machiavelli
fa1d3f305b Core/Misc: Implement Trinity::Auto_Ptr. Ditches ACE_Refcounted_AutoPtr (we strongly suspect it does NOT clean up the underlying pointer properly). Underlying type is now ACE_Strong_Bound_Ptr 2012-03-25 21:21:23 +02:00
leak
eb1af30399 Core/DBLayer: Convert PAppend() queries to prepared statements No.3 2012-03-25 20:20:25 +02:00
leak
71c02fb54d Core/DBLayer: Convert PAppend() queries to prepared statements No.2 2012-03-25 18:32:26 +02:00
leak
4e6fce1112 Core/DBLayer: Typo on query conversion 2012-03-25 16:34:09 +02:00
leak
c6cbe4c77c Core/DBLayer: Convert PAppend() queries to prepared statements No.1 2012-03-25 16:25:06 +02:00
Machiavelli
eda06321b9 Update src/server/shared/Database/Field.h 2012-03-25 14:11:24 +03:00
Machiavelli
87176c84d3 Core/DBLayer: Refine field type checks in Field::GetXXX methods. Should give us logs of wrong GetXXX calls for a certain type without having to dig trough valgrind logs. 2012-03-25 14:10:06 +03:00
leak
61691d7698 Core/DBLayer: Restore pinfo timestamp output (Prepared statment results don't deliver TIMESTAMP as string) 2012-03-25 00:00:16 +01:00
click
cbcd4e6afb Core: Fix .pinfo handling of player level and securitylevel after recent cleanups (and clean up my last commit) 2012-03-24 22:59:23 +01:00