Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 21:32:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14782 from doctaweeks/fixes-for-6.x

Browse Source 
Minor fixes for 6.x
(cherry picked from commit 0cf0209741)

Conflicts:
	src/server/bnetserver/Main.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
	src/server/game/Battlegrounds/Zones/BattlegroundTP.h
	src/server/game/Chat/Channels/Channel.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.h
	src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
	src/server/shared/Cryptography/SHA256.h
This commit is contained in:
MitchesD
2015-05-30 19:34:25 +02:00
committed by DDuarte
parent 79dd72ae70
commit db8fdd94ed
14 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
View File

@@ -102,7 +102,7 @@ public:
}
}
virtual void Update(uint32 /*diff*/) // correct order goes form 1-6
virtual void Update(uint32 /*diff*/) override // correct order goes form 1-6
{
switch (State)
{

2
src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
View File

@@ -202,7 +202,7 @@ class boss_archaedas : public CreatureScript
DoMeleeAttackIfReady();
}
void JustDied (Unit* /*killer*/)
void JustDied (Unit* /*killer*/) override
{
instance->SetData(DATA_ANCIENT_DOOR, DONE); // open the vault door
instance->SetData(DATA_MINIONS, SPECIAL); // deactivate his minions

8
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
View File

@@ -261,13 +261,13 @@ class OPvPCapturePointNA : public OPvPCapturePoint
public:
OPvPCapturePointNA(OutdoorPvP* pvp);
bool Update(uint32 diff);
bool Update(uint32 diff) override;
void ChangeState();
void ChangeState() override;
void FillInitialWorldStates(WorldPacket & data);
void FillInitialWorldStates(WorldPacket & data) override;
bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go);
bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go) override;
int32 HandleOpenGo(Player* player, ObjectGuid guid) override;

12
src/server/scripts/Spells/spell_quest.cpp
View File

@@ -339,7 +339,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q11396_11399_scourging_crystal_controller_SpellScript();
};
}
};
// 43882 Scourging Crystal Controller Dummy
@@ -375,7 +375,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript
SpellScript* GetSpellScript() const override
{
return new spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript();
};
}
};
// http://www.wowhead.com/quest=11515 Blood for Blood
@@ -856,7 +856,7 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_symbol_of_life_dummy_SpellScript();
};
}
};
// http://www.wowhead.com/quest=12659 Scalps!
@@ -899,7 +899,7 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q12659_ahunaes_knife_SpellScript();
};
}
};
enum StoppingTheSpread
@@ -945,7 +945,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q9874_liquid_fire_SpellScript();
};
}
};
enum SalvagingLifesStength
@@ -989,7 +989,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader
SpellScript* GetSpellScript() const override
{
return new spell_q12805_lifeblood_dummy_SpellScript();
};
}
};
/*