Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,225 Commits 4 Branches 146 Tags
e26dcbe2f5b5b48351117052e65c474da7992913
Commit Graph

17709 Commits

Author SHA1 Message Date
Vincent_Michael
e26dcbe2f5 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_misc.cpp
 2014-01-18 20:43:06 +01:00
Vincent_Michael
20c3eebfa7 Fix revert fail in ad8c046916 2014-01-18 20:31:41 +01:00
Machiavelli
68af9376f6 Core/Calendar: Add documentation regarding fix in previous commit 2014-01-18 14:00:19 +01:00
Machiavelli
ca6fd8aad2 Merge pull request #11462 from Dehravor/add-event-memleaks 
Core/Calendar: Fix memory leaks due to BytebufferException thrown
 2014-01-18 04:57:29 -08:00
Shauren
c431f463a1 Core/Items: Fixed swapping equipment sets in combat 2014-01-18 12:58:01 +01:00
Dehravor
3a9a634a91 Core/Calendar: Fix memory leak when guild announcement is created 2014-01-18 11:47:05 +01:00
Dehravor
51e38872c7 Core/Calendar: Fix memory leak when malformed CMSG_CALENDAR_ADD_EVENT is received 2014-01-18 10:30:39 +01:00
Vincent_Michael
ad8c046916 Core/Revert: ... 2014-01-18 01:36:12 +01:00
Discover-
735cebf7a3 Core/Commands: The .setskill command is now usable even if the player doesn't already have the skill learned. 2014-01-18 01:05:03 +01:00
Vincent_Michael
3276a786cc Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-01-18 01:03:24 +01:00
Vincent_Michael
4027686b5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/ItemHandler.cpp
 2014-01-18 01:01:11 +01:00
Discover-
bbd84d211d Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2014-01-17 18:44:01 +01:00
Discover-
ebfdeb067f Core/Spells: Rename Spell::EffectSummonDeadPet with Spell::EffectResurrectPet and get rid of two TODO's that are already done. 2014-01-17 17:54:52 +01:00
Dekadence
eb2818e74a Core/VoidStorage: Fix SMSG_VOID_STORAGE_CONTENTS structure 
* If you have items stored in void storage with owner guid, the void storage appear empty or partitial emplty
 2014-01-17 13:33:02 +01:00
Machiavelli
e2376fcb72 Merge pull request #11397 from Dehravor/guild-view-offinote 
Core/Guild: Don't allow players to view officer notes without proper rights
 2014-01-17 03:47:01 -08:00
Zabustak
101cad1f28 Show Kick, Mute and Ban in world 2014-01-17 12:23:36 +01:00
Discover-
c1a468365b Core/Misc: When a player changes its faction its only removed from all its arena teams if cross-faction interaction is turned off. 2014-01-17 08:17:09 +01:00
joschiwald
940e52236b Core/Entities: bg vehicle will also have charmer's faction (save faction before charm and restore old faction after charm) 2014-01-17 01:07:37 +01:00
Discover-
45dc95c8dc Core/Items: Fix an exploit where the player was able to send CMSG_SET_AMMO with items they didn't have in their bags. Only a visual bug (not sure if it gave bonuses too, which iirc do appear in later expansions). 2014-01-16 20:48:37 +01:00
Discover-
61f45283ef Core/Misc: Fix an exploit where moving while consuming something that would fade when the player stands up would stay if the player started moving and using the effect at the same time. Thanks to @FrozenSoul and @jildor. 
Fixes #6271
 2014-01-16 20:44:03 +01:00
jackpoz
cbba22ba68 Core/SAI: Fix assertion triggered in SmartScript 
Remove assertion in SmartScript added in b8625f41bd and handle SmartScripts with GetBaseObject() returning NULL , like SmartTrigger . In this case SmartScript::mTargetStorage cannot be sanitized and might contain references to free'd WorldObjects if the script doesn't last a single Map::Update() call.
 2014-01-15 20:20:01 +01:00
Warpten
2d54b88d57 Core/Spells: Crash fix for f9ccb6f585. 
Closes #11447. My bad.
 2014-01-15 19:39:11 +01:00
Aokromes
5299d1187e Merge pull request #10984 from armano2/arena_badge 
Core/Arena Fix Arena badge
 2014-01-15 07:03:15 -08:00
Duarte Duarte
d5dbd95197 Merge pull request #11130 from Dekadencee/4.3.4 
[4.3.4] Fix SMSG_REQUEST_PVP_REWARDS_RESPONSE structure
 2014-01-15 07:01:18 -08:00
Warpten
b2de15ef88 Core/Players: Fixed some more "issues" with resilience. 2014-01-14 20:44:56 +01:00
Warpten
f9ccb6f585 Core/Spells: Fixed issues with spells using MaxRadius not considering radius spellmods. 2014-01-14 20:37:17 +01:00
Shauren
4d80611a10 Core/Chat: Fixed chat packets structure 2014-01-14 16:31:45 +01:00
joschiwald
5b6b26262f Misc: missing changes after merge 2014-01-14 12:38:19 +01:00
jackpoz
d78e69cdc6 Core/Instances: Fix memory leak in InstanceSaveMgr 
Fix memory leak in InstanceSaveMgr added in 1f170c99ef .
Make InstanceSave::SetToDelete() private since it's not supposed to be used by anything other than InstanceSave or its friend class InstanceSaveMgr .
 2014-01-13 22:52:35 +01:00
Vincent_Michael
cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-01-13 20:34:21 +01:00
Elron103
88ecc9533a Core/Entities: Fix combat state setting when FFA PvP flag is set 
Description:
Currently there is an issue, when you are in FFA areas, but you dont have PvP flag activated.

You should get the PvP-In-Combat delay timer, but instead you just get the usual timer as if you would not fight in PvP.

Reproduction:
1) Get two players in FFA area Gurubashi arena down in the battle area (.tele Gurubashi)

2) Fight each other

3) When stopping combat, the combat state will switch off immediately. But it is supposed to switch off after some delay, because it was a PvP fight.

Closes #11103

Signed-off-by: Duarte Duarte <dnpd.dd@gmail.com>
 2014-01-13 17:03:43 +00:00
Duarte Duarte
80a398372d Core/Player: Fix compile error introduced in ##11377 merge 2014-01-13 16:50:07 +00:00
Duarte Duarte
949dc9bf16 Merge pull request #11377 from Yelvann/master 
Core/Instances: Fix exploit too much players in instances/raids
 2014-01-13 08:33:29 -08:00
jackpoz
b8625f41bd Core/SAI: Fix crash in SmartScript 
Fix crash in SmartScript storing WorldObject* instead of guid as targets in SmartScript::mTargetStorage , used by SMART_TARGET_STORED target type , SMART_ESCORT_TARGETS and other escort related code.
Fixes #11228 , #10157 .

Valgrind log:
 Invalid read of size 4
  at : Object::GetTypeId() const (Object.h:140)
  by : SmartScript::IsPlayer(WorldObject*) (SmartScript.h:73)
  by : SmartScript::ProcessAction(SmartScriptHolder&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:330)
  by : SmartScript::ProcessEvent(SmartScriptHolder&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:2662)
  by : SmartScript::ProcessAction(SmartScriptHolder&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:2226)
  by : SmartScript::ProcessTimedAction(SmartScriptHolder&, unsigned int const&, unsigned int const&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:2238)
  by : SmartScript::ProcessEvent(SmartScriptHolder&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:2685)
  by : SmartScript::UpdateTimer(SmartScriptHolder&, unsigned int) (SmartScript.cpp:3198)
  by : SmartScript::OnUpdate(unsigned int) (SmartScript.cpp:3244)
  by : SmartAI::UpdateAI(unsigned int) (SmartAI.cpp:331)
  by : Creature::Update(unsigned int) (Creature.cpp:544)
  by : void Trinity::ObjectUpdater::Visit<Creature>(GridRefManager<Creature>&) (GridNotifiers.cpp:340)
 2014-01-12 20:23:13 +01:00
Vincent_Michael
a73e8511f9 Fix non pch build 2014-01-12 02:02:02 +01:00
DarkBrain2580
de1d75af70 Spells: Fix Alcohol-Free Brewfest Sampler 
Closes #10956

Signed-off-by: Duarte Duarte <dnpd.dd@gmail.com>
 2014-01-12 00:41:54 +00:00
zengwf
23acf75d3b Core/Movement: Add LOS check for fleeingmovement target point. 
Prevents fleeing or feared units from going to upper floor ignoring walls/ceilings with mmaps on(and usually get stucked).

Current implementation just randomly selects a distance and angle against the frighting unit, when in narrow circumstance such as underground caves, such targeting point would be at another floor.

Closes #11300
Ref #9475 (needs fixed confirmation)
 2014-01-12 00:33:33 +00:00
Duarte Duarte
0eadb41ed1 Merge pull request #11310 from Ric101/can_quest_reward 
Core/Players: On CanRewardQuest, use the same item dest vector for all potential rewards

Solves issues where the player has enough bag space for each item individually, but not all of them together.

Example to reproduce previous issue:

Obtain Battle of the Crimson Watch (10781)
Make sure you only have 1 slot available in your inventory
Turn in the quest, watch as you don't receive one of the rewards
 2014-01-11 16:21:41 -08:00
Duarte Duarte
65c941b88d Merge pull request #11342 from Carbenium/Svala 
Scripting/Utgarde Pinnaccle: Fix visual during Svala's transformation
 2014-01-11 16:20:16 -08:00
Dr-J
b83c252851 Scripts/NPCs: Remove core script for rogue trainers which was overriding db conditions 
SAI and conditions for rogue trainers to provide elegant leter to rogues provided that is level 24 or higher, does not have elegant letter and does not have taken, rewarded or complete the quest which elegant letter starts

Closes #11378

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-01-12 00:17:21 +00:00
mthsena
0b5728f8a7 Core&Conf: Small cosmetic fixes 
Closes #11392

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-01-12 00:07:29 +00:00
Vincent_Michael
0214db9bf5 Fix build 2014-01-12 00:59:05 +01:00
DDuarte
b204d71cb4 Core: Fix build due to merge resolution errors 2014-01-11 23:29:27 +00:00
Duarte Duarte
e42cc9d5dd Merge pull request #11426 from Dehravor/invalidate-player 
Core/Entities: Implement SMSG_INVALIDATE_PLAYER
 2014-01-11 12:47:12 -08:00
Dehravor
4d3b7e6799 Core/Entities: Don't allow to login while character is forced to rename 2014-01-11 21:20:24 +01:00
DDuarte
ced89d7c68 Merge branch 'master' into 4.3.4 2014-01-11 17:27:41 +00:00
DDuarte
08003577de Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-01-11 17:26:22 +00:00
Dehravor
619f42c1b0 Core/Entities: Implement SMSG_INVALIDATE_PLAYER 2014-01-11 18:22:56 +01:00
jackpoz
086622bfc1 Core/Battlegrounds: Fix offline players not being resurrected when Battleground ends 
Fixes #7081
 2014-01-11 17:18:36 +01:00
jackpoz
6f6ad952b9 Core/Wintergrasp: Fix typo in CMSG_HEARTH_AND_RESURRECT handler 
Fix CMSG_HEARTH_AND_RESURRECT handler trying to resurrect players with 100x hp/mana/energy ( SetHealth()/SetPower() were sanitizing the input anyway ) .
 2014-01-11 15:23:52 +01:00