Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 16:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,758 Commits 4 Branches 146 Tags
67d616c195800364074366bee457cc904b429359
Commit Graph

4301 Commits

Author SHA1 Message Date
MitchesD
ae221b0f02 Scripts/SteamVault: reworked InstanceScript 2013-09-23 22:00:42 +02:00
Shauren
3aa9446d54 Merge pull request #10875 from zorix/PR2 
Core/Script:
 2013-09-22 07:58:42 -07:00
zorix
8b2c40e0f9 Core/Script: 
ICC: Convert possible non valid pointer to guid

Close #9954
 2013-09-22 16:38:15 +02:00
Vincent-Michael
f2dff3da38 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
 2013-09-22 15:31:21 +02:00
jackpoz
9579d0a3e7 Scripts/ScarletEnclave: Fix uninitialized values in Highlord Darion Mograine 
Reset() has if checks on values that are initialized after them so it's required to initialize these fields in the constructor.

Valgrind log:
 Conditional jump or move depends on uninitialised value(s)
  by 0x11CF472: HashMapHolder<Creature>::Find(unsigned long) (ObjectAccessor.h:67)
  by 0x11CE36F: Creature* ObjectAccessor::GetObjectInWorld<Creature>(unsigned long, Creature*) (ObjectAccessor.h:114)
  by 0x1257C13: Creature* ObjectAccessor::GetObjectInMap<Creature>(unsigned long, Map*, Creature*) (ObjectAccessor.h:135)
  by 0x12E64F1: Map::GetCreature(unsigned long) (Map.cpp:2767)
  by 0x10AF4DE: Unit::GetCreature(WorldObject&, unsigned long) (Unit.cpp:13021)
  by 0x16F8F81: npc_highlord_darion_mograine::npc_highlord_darion_mograineAI::Reset() (chapter5.cpp:386)
  by 0x16F8D36: npc_highlord_darion_mograine::npc_highlord_darion_mograineAI::npc_highlord_darion_mograineAI(Creature*) (chapter5.cpp:314)
  by 0x16F8CD6: npc_highlord_darion_mograine::GetAI(Creature*) const (chapter5.cpp:307)
  by 0x132AF6C: ScriptMgr::GetCreatureAI(Creature*) (ScriptMgr.cpp:796)
  by 0x1441D45: FactorySelector::selectAI(Creature*) (CreatureAISelector.cpp:41)
 2013-09-21 22:36:23 +02:00
zorix
ff274cda0b Core/Script: 
Added missing NULL pointer check
 2013-09-18 23:31:41 +02:00
joschiwald
05e72b4906 Core/Achievements: Implemented ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE 2013-09-18 22:55:10 +02:00
Vincent-Michael
e740332c0b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-09-15 23:20:13 +02:00
Nay
478ec28e6d Merge pull request #10823 from jackpoz/icewall_overflow 
Scripts/HoR: Fix possible array overflow
 2013-09-15 06:58:24 -07:00
jackpoz
6477f8c453 Scripts/HoR: Fix possible array overflow 
Fix possible array overflow reported by coverity, issue id 1062436 .
 2013-09-15 14:12:54 +02:00
Vincent-Michael
85e49d0d14 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/worldserver/worldserver.conf.dist
 2013-09-13 23:21:50 +02:00
jackpoz
6581d7db85 Core/Commands: Fix NULL dereference crash in .account password 
Fix NULL dereference crash in .account password added in bd8d0cfbce
Fixes #10791
 2013-09-13 20:57:53 +02:00
Machiavelli
bd8d0cfbce Fix build 2013-09-12 16:42:22 +01:00
Nay
4df862dd4c Merge pull request #10792 from Ascathor/master 
Core/Command: Fixing .account password to no longer crash
 2013-09-12 07:50:07 -07:00
Ascathor
8c596b97bf Core/Command: Fixing .account password to no longer crash 
And add some comments to it.
 2013-09-12 16:39:41 +02:00
Vincent-Michael
974bf5c427 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
 2013-09-11 22:35:45 +02:00
Nay
e4ed64a6b7 Merge pull request #10782 from Ascathor/master 
Core/Commands: Fixing some problems with .account email
 2013-09-11 11:55:31 -07:00
Ascathor
3861ba5a25 Core/Commands: Fixing some problems with .account email 2013-09-11 20:54:04 +02:00
Nay
deb2fb7939 Merge pull request #10781 from jackpoz/create_pet_creaturetemplate 
Scripts/Commands: Retrieve Creature template in HandlePetCreateCommand f...
 2013-09-11 11:52:03 -07:00
Nay
9ca34c2e02 Merge pull request #10779 from jackpoz/murmur_unused_field 
Scripts/Murmur: Remove unused field
 2013-09-11 11:51:29 -07:00
Nay
baa159dbd4 Merge pull request #10736 from jackpoz/localtime_race_condition 
Core/Thread: Fix race condition converting time values to local time
 2013-09-11 11:50:18 -07:00
jackpoz
dfc8a092a6 Scripts/Commands: Retrieve Creature template in HandlePetCreateCommand from Creature itself 
CreatureTemplate can be retrieved directly from the Creature itself instead of using ObjectMgr::GetCreatureTemplate(id) .
 2013-09-11 20:31:50 +02:00
jackpoz
625e47e9d3 Scripts/Murmur: Remove unused field 
Remove unused class field.
 2013-09-11 20:00:29 +02:00
joschiwald
77f90c1c67 Scripts/Halion: refixed Twilight Cutter 
Scripts/Garfrost: fixed forge jump
 2013-09-11 17:07:29 +02:00
MitchesD
3420c70a47 Scripts/PitOfSaron: some changes 
Closes #10740
 2013-09-11 15:52:59 +02:00
Vincent-Michael
5583bcfeea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
 2013-09-10 19:53:43 +02:00
Spp
78363e11b5 Core/RBAC: Move titles and wp commands to RBAC (using individual permissions) 2013-09-10 15:26:48 +02:00
Spp
b10241876e Core/RBAC: Move ticket commands to RBAC (using individual permissions) 2013-09-10 15:13:08 +02:00
Spp
68ab10ccd4 Core/RBAC: Move tele commands to RBAC (using individual permissions) 2013-09-10 15:01:39 +02:00
Spp
abbc6b2760 Core/RBAC: Move server commands to RBAC (using individual permissions) 2013-09-10 14:57:01 +02:00
Spp
7183a355d2 Core/RBAC: Move reset commands to RBAC (using individual permissions) 2013-09-10 14:33:27 +02:00
Spp
1f95f0b0b8 Core/RBAC: Move reload command to RBAC (using individual permissions) 2013-09-10 14:25:07 +02:00
Spp
4f632ee3ff Core/RBAC: Move quest commands to RBAC (using individual permissions) 2013-09-10 13:57:30 +02:00
Spp
efa194a7ce Core/RBAC: Move npc commands to RBAC (using individual permissions) 2013-09-10 13:48:57 +02:00
Spp
04b313557e Core/RBAC: Move modify commands to RBAC (using individual permissions) 2013-09-10 13:28:32 +02:00
Spp
4d36ce7405 Core/RBAC: Move mmap commands to RBAC (using individual permissions) 2013-09-10 13:08:39 +02:00
Spp
1038446278 Core/RBAC: Move misc commands to RBAC (using individual permissions) 2013-09-10 12:59:25 +02:00
Spp
ec1e88d888 Core/RBAC: Move send commands to RBAC (using individual permissions) 2013-09-10 12:24:40 +02:00
Spp
83cb44d79f Core/RBAC: Move pet commands to RBAC (using individual permissions) 
- Pet commands moved from cs_misc.cpp to own file
 2013-09-10 12:07:03 +02:00
Spp
1eee42433b Core/RBAC: Move group commands to RBAC (using individual permissions) 
- group commands moved from cs_misc.cpp to own file
- renamed groupsummon to "group summon"
 2013-09-10 11:45:59 +02:00
Vincent-Michael
ce742dc7a0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Guilds/Guild.cpp
 2013-09-09 18:26:31 +02:00
Machiavelli
e8675dd4ed Scripts/Blood Furnace: Fix possible compile errors on old VS versions 2013-09-07 15:17:56 +01:00
jackpoz
9578b5f87a Core/Thread: Fix race condition converting time values to local time 
Replace thread-unsafe localtime() http://www.cplusplus.com/reference/ctime/localtime/ with thread-safe portable ACE_OS::localtime_r() .

Helgrind log:
 Possible data race during read of size 4 at 0x6F183C0 by thread #1
 Locks held: none
  at 0x14E72E3: World::InitDailyQuestResetTime() (World.cpp:2772)
  by 0x14E3A01: World::SetInitialWorldSettings() (World.cpp:1790)
  by 0x101122A: Master::Run() (Master.cpp:164)
  by 0x101740C: main (Main.cpp:142)

 This conflicts with a previous write of size 4 by thread #2
 Locks held: none
  at 0x6C2D3BA: __tzfile_compute (tzfile.c:797)
  by 0x6C2D036: __tz_convert (tzset.c:627)
  by 0x164146C: LogMessage::getTimeStr(long) (Appender.cpp:23)
  by 0x1641550: LogMessage::getTimeStr() (Appender.cpp:31)
  by 0x1641722: Appender::write(LogMessage&) (Appender.cpp:80)
  by 0x1633FCE: Logger::write(LogMessage&) (Logger.cpp:83)
  by 0x16433D8: LogOperation::call() (LogOperation.cpp:29)
  by 0x16428A4: LogWorker::svc() (LogWorker.cpp:45)
 2013-09-07 14:37:54 +02:00
Machiavelli
287dc307bc Merge pull request #10724 from jackpoz/guild_disband_leak 
Core/Guild: Fix memory leak on Guild disband
 2013-09-07 05:07:28 -07:00
joschiwald
f66120060a Scripts/Spells: drop obsolete code 2013-09-07 01:21:36 +02:00
Vincent-Michael
be75ddc2bd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
 2013-09-06 21:55:19 +02:00
joschiwald
e5af3e25f9 -.- 2013-09-06 21:18:07 +02:00
joschiwald
49e2ad73d2 Fixed build 2013-09-06 21:16:09 +02:00
joschiwald
9429251e2e Scripts/YoggSaron: fixed rewarding loot 2013-09-06 21:02:02 +02:00
joschiwald
adef15cd0f Core/Spells: add an other condition to SpellInfo::NeedsToBeTriggeredByCaster to correct spells with are wrongly triggered by target instead of caster 
- convert archavons rock shards to spellscript (now it works properly)
- add a spellscript for one spell that can't be corrected by this (and delete the sai hack, now i uses the correct spell)
 2013-09-06 20:57:38 +02:00