Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,190 Commits 4 Branches 146 Tags
5b6b26262f73a459ddc3ae2162f2d704f84ed2cc
Commit Graph

17677 Commits

Author SHA1 Message Date
joschiwald
5b6b26262f Misc: missing changes after merge 2014-01-14 12:38:19 +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
jackpoz
8fcfabe784 Core/Spells: Fix potions cooldown in combat 
Fix a cooldown issue related to potions allowing Players in combat to use more than 1 potion in a row, especially with high latency.
This also fixes an exploit about using infinite potions in combat just by skipping the client-side check.
The original implementation c064c2e2e1 was missing a check in Spell::CheckCast() about this particular case since Potion cooldown is added only after the Player goes out of combat.
Fixes #1259 .
 2014-01-10 22:39:08 +01:00
DDuarte
33c2bd5ce1 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	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/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.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/zulaman.cpp
	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_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
 2014-01-10 18:32:05 +00:00
DDuarte
352a2682b1 Core&Scripts: Compile fix 2014-01-10 17:23:14 +00:00
joschiwald
41b613186e Core/Battlefield: some codestyle changes 2014-01-10 17:42:08 +01:00
joschiwald
7378baee49 Scripts/PoS/Garfrost: cleanup saronit blocks after death 2014-01-10 17:37:03 +01:00
joschiwald
7ec7fcf78c Core/SAI: drop unneeded code 2014-01-10 17:36:04 +01:00
Duarte Duarte
14512d6abb Core: MSG_NULL_ACTION was renamed to NULL_OPCODE in this branch 
Fix build
 2014-01-10 06:50:59 +00:00
DDuarte
3c9ae378f1 Core/Chat: Fix chat addon packets (languages & prefixes) 2014-01-10 06:30:22 +00:00
DDuarte
25d1be5a75 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/Battlefield.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Texts/CreatureTextMgr.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2014-01-10 06:13:26 +00:00
DDuarte
86107a0296 Merge branch 'master' into 4.3.4 2014-01-10 03:16:59 +00:00
joschiwald
6fff9d08b2 Fix build 2014-01-09 23:31:52 +01:00
joschiwald
e80d1f3465 Scripts/BloodFurnace: 
* cleanup InstanceScript
* fix broggok poison cloud

Scripts/Naxxramas/Grobbulus:
* fix poison cloud
* fix mutating injection
 2014-01-09 23:17:02 +01:00
joschiwald
a60ba240b7 Core/Entities: add some log messages in CheckCreatureTemplate 
* Happy Error Spam
 2014-01-06 20:30:11 +01:00
Shauren
619edff196 Misc: 
* Tools: Fixed a compile warning
* Commands: Fixed npcflag format in .npc info
 2014-01-06 13:53:29 +01:00
Shauren
15cbe5858c Core/Movement: Fixed vehicle passengers disappearing clientside 
Closes #11411
 2014-01-06 13:51:40 +01:00
joschiwald
95f14f921b Scripts/HoS: update Maiden of Grief 2014-01-05 16:47:07 +01:00
Shauren
ad84759d2f Core/Threading: Handle CMSG_ZONEUPDATE only in WorldSession update - changing zones triggers changing chat channels, what is not a thread safe operation 2014-01-05 00:52:10 +01:00
joschiwald
738afccfc1 DB/Spells: correct more spelldifficulty_dbc entries 
* add log message to find wrong entries
 2014-01-05 00:49:54 +01:00
joschiwald
cd76d32907 Core/Entities: correct creature damage, offhand damage should work too 
* todo: some creatures need dmg_multiplier update in creature_template
 2014-01-04 18:22:06 +01:00
Warpten
ff61e4d79d Scripts/Halion: Fixed Soul Consumption's pull effect. 
Thanks to Winterfell for pointing out the issue.
 2014-01-04 17:48:51 +01:00
jackpoz
1f170c99ef Core/Instances: Fix Instance binding 
Fix players not being bound to instance if the group was disbanded before killing any boss.
Fixes #437
 2014-01-03 18:56:11 +01:00
Shauren
9d6904f03d Core/Vehicles 
* Fixed vehicle orientation on transports
* Fixed exiting vehicles on moving transports
 2014-01-02 14:20:05 +01:00
jackpoz
82181a8622 Core/Loot: Fix Master Loot exploit 
Fix Master Loot exploit allowing any online Player to receive loot.
 2014-01-01 21:42:15 +01:00
Dehravor
14287326c7 Core/Guild: Fix an exploit related to CMSG_GUILD_CREATE 2014-01-01 13:52:03 +01:00
Vincent_Michael
20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01:00
Subv
a63780fd90 Tools/MeshExtractor: Fixed continent meshes, exclude triangles with material 0xFF from the mesh. 2013-12-31 18:03:04 -05:00
Subv
060bc7817f Tools/MeshExtractor: Added some consts 2013-12-31 17:19:18 -05:00
Subv
7b9dbfb1db Tools/MeshExtractor: Fixed a few leaks and added the liquid vertices to the output data. 2013-12-31 16:22:24 -05:00