aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-04-03 08:03:01 +0200
committerShauren <shauren.trinity@gmail.com>2017-04-03 08:03:01 +0200
commit8cc232054af79a7268a6b5263abacaf294751a6a (patch)
tree8371d10ddf133fd9184226174de8970ae4d72952 /src
parent8f49a32d1313ca1a40b77c77058249b4fa510565 (diff)
Build fix
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp1
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e477fdd03d0..abd11158ca3 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -12949,7 +12949,6 @@ void Unit::Kill(Unit* victim, bool durabilityLoss)
// FORM_SPIRIT_OF_REDEMPTION and related auras
victim->CastSpell(victim, 27827, true, NULL, spiritOfRedemptionEffect);
spiritOfRedemption = true;
- break;
}
}
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 2f9171f2caa..614cd02bcca 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -205,7 +205,7 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellInfo const* spellproto)
if (spellproto->SpellFamilyFlags[0] & 0x200)
return DIMINISHING_ROOT;
// Mass Entanglement -- 102359
- if (spellproto->SpellFamilyFlags[2] 0x4)
+ if (spellproto->SpellFamilyFlags[2] & 0x4)
return DIMINISHING_ROOT;
// Faerie Fire -- 770, 20 seconds in PvP (6.0)