Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-31 14:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4

Browse Source 
Conflicts:
	README.md
	sql/updates/world/2015_02_06_13_world_335.sql
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Carbenium
2015-07-21 21:45:04 +02:00
parent 9fca7b8017 b69fd4ac68
commit 7d5d040948
25 changed files with 467 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Commands/cs_debug.cpp
View File

@@ -300,7 +300,7 @@ public:
else if (commentToken[1] == '/')
{
std::string str;
getline(ifs, str);
std::getline(ifs, str);
continue;
}
// regular data

9
src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
View File

@@ -29,6 +29,7 @@ EndContentData */
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "PassiveAI.h"
#include "Player.h"
/*######
@@ -48,14 +49,18 @@ class npc_webbed_creature : public CreatureScript
public:
npc_webbed_creature() : CreatureScript("npc_webbed_creature") { }
struct npc_webbed_creatureAI : public ScriptedAI
struct npc_webbed_creatureAI : public NullCreatureAI
{
npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) { }
npc_webbed_creatureAI(Creature* creature) : NullCreatureAI(creature) { }
void Reset() override { }
void EnterCombat(Unit* /*who*/) override { }
void AttackStart(Unit* /*who*/) override { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void JustDied(Unit* killer) override
{
uint32 spawnCreatureID = 0;

2
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -1259,7 +1259,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader
return;
uint32 triggerSpell = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell;
SpellInfo const* spell = sSpellMgr->GetSpellInfo(triggerSpell);
SpellInfo const* spell = sSpellMgr->EnsureSpellInfo(triggerSpell);
spell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, caster);
int32 damage = spell->Effects[EFFECT_0].CalcValue(caster);