mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 310

Browse source 
Conflicts:
	src/game/GameObject.h
	src/game/MiscHandler.cpp
	src/game/Player.cpp
	src/game/QueryHandler.cpp
	src/game/QuestHandler.cpp
	src/game/SkillHandler.cpp
	src/game/SpellAuras.cpp
	src/game/SpellEffects.cpp
	src/game/Unit.cpp
	src/game/WorldSession.h
This commit is contained in:
tomrus88 2009-05-29 19:15:43 +04:00
commit e454cb693d
8 changed files with 244 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/SpellEffects.cpp
View file

@ -279,7 +279,7 @@ void Spell::EffectInstaKill(uint32 /*i*/)
m_caster->CastSpell(m_caster, spellID, true);
}
if(m_caster == unitTarget) // prevent interrupt message
if(m_caster == unitTarget) // prevent interrupt message
finish();
m_caster->DealDamage(unitTarget, unitTarget->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@ -2718,7 +2718,7 @@ void Spell::EffectCreateItem2(uint32 i)
// remove reagent
uint32 count = 1;
player->DestroyItemCount (item_id, count, true);
player->DestroyItemCount(item_id, count, true);
}
// create some random items