diff options
| author | megamage <none@none> | 2008-11-30 17:48:10 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-11-30 17:48:10 -0600 |
| commit | 6ab74d1ba4375702de31828d1d0dd7fd8569db15 (patch) | |
| tree | a5013f209be2f716f35276af24c0971b548af18a /src | |
| parent | daae03906298c1ed84b76cf68777e530c6323cdf (diff) | |
*Fix the bug that server crashes when loading.
*Fix the bug that rogue does not remove stealth aura when do melee attack.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Unit.cpp | 3 | ||||
| -rw-r--r-- | src/game/World.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 303e154ab71..0052efe95ce 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9764,8 +9764,7 @@ void Unit::CombatStart(Unit* target) if(Player* attackedPlayer = target->GetCharmerOrOwnerPlayerOrPlayerItself()) SetContestedPvP(attackedPlayer); - if(!isInCombat()) // remove this? - RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ATTACK); + RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ATTACK); } void Unit::SetInCombatState(bool PvP) diff --git a/src/game/World.h b/src/game/World.h index 3784f0a3cf0..9dd989bd4fe 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -178,7 +178,6 @@ enum WorldConfigs CONFIG_LISTEN_RANGE_SAY, CONFIG_LISTEN_RANGE_TEXTEMOTE, CONFIG_LISTEN_RANGE_YELL, - CONFIG_VALUE_COUNT, CONFIG_MAX_WHO, CONFIG_PLAYER_START_GOLD, @@ -205,6 +204,8 @@ enum WorldConfigs CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS, CONFIG_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS, CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER, + + CONFIG_VALUE_COUNT, }; /// Server rates |