diff options
| -rwxr-xr-x | src/server/game/Globals/ObjectAccessor.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/WorldSession.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 12 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 8bbf5d8e0c1..c8acc295c8f 100755 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -286,7 +286,7 @@ Corpse* ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia Corpse* bones = NULL; // create the bones only if the map and the grid is loaded at the corpse's location // ignore bones creating option in case insignia - + if (map && (insignia || (map->IsBattlegroundOrArena() ? sWorld->getBoolConfig(CONFIG_DEATH_BONES_BG_OR_ARENA) : sWorld->getBoolConfig(CONFIG_DEATH_BONES_WORLD))) && !map->IsRemovalGrid(corpse->GetPositionX(), corpse->GetPositionY())) diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 8fd4430a72c..fdae9f18f6b 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -755,7 +755,7 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi) if (mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION)) data >> mi->splineElevation; - // This must be a packet spoofing attempt. MOVEMENTFLAG_ROOT sent from the client is not valid, + // This must be a packet spoofing attempt. MOVEMENTFLAG_ROOT sent from the client is not valid, // and when used in conjunction with any of the moving movement flags such as MOVEMENTFLAG_FORWARD // it will freeze clients that receive this player's movement info. if (mi->HasMovementFlag(MOVEMENTFLAG_ROOT)) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index 5c979fa8ebd..dd511516cb4 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -65,19 +65,19 @@ enum AssemblyEvents { // General EVENT_BERSERK = 1, - + // Steelbreaker EVENT_FUSION_PUNCH = 2, EVENT_STATIC_DISRUPTION = 3, EVENT_OVERWHELMING_POWER = 4, - + // Molgeim EVENT_RUNE_OF_POWER = 5, EVENT_SHIELD_OF_RUNES = 6, EVENT_RUNE_OF_DEATH = 7, EVENT_RUNE_OF_SUMMONING = 8, EVENT_LIGHTNING_BLAST = 9, - + // Brundir EVENT_CHAIN_LIGHTNING = 10, EVENT_OVERLOAD = 11, diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index fe0ecf26c96..987572fe13c 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1217,7 +1217,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader { public: spell_gen_vehicle_scaling() : SpellScriptLoader("spell_gen_vehicle_scaling") { } - + class spell_gen_vehicle_scaling_AuraScript : public AuraScript { PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript); @@ -1230,7 +1230,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader float factor; uint16 baseItemLevel; - + // TODO: Reserach coeffs for different vehicles switch (GetId()) { @@ -1243,14 +1243,14 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader baseItemLevel = 170; break; } - + float avgILvl = caster->ToPlayer()->GetAverageItemLevel(); if (avgILvl < baseItemLevel) return; // TODO: Research possibility of scaling down - + amount = uint16((avgILvl - baseItemLevel) * factor); } - + void Register() { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); @@ -1258,7 +1258,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT); } }; - + AuraScript* GetAuraScript() const { return new spell_gen_vehicle_scaling_AuraScript(); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 76ed553bfba..9af96d20903 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -447,7 +447,7 @@ LogFileLevel = 0 # 1 - Anything related to units that doesn't fit in other # categories. # 2 - Anything related to pets. -# 4 - Anything related to vehicles. +# 4 - Anything related to vehicles. # 8 - Anything related to C++ AI, instance scripts, etc. # 16 - Anything related to DB AI, such as SAI, EAI, CreatureAI # 32 - Anything related to DB map scripts @@ -467,7 +467,7 @@ LogFileLevel = 0 # 131072 - Anything related to player loading from DB # (Player::_LoadXXX functions) # 262144 - Anything related to items -# 524288 - Anything related to player skills +# 524288 - Anything related to player skills # (do not confuse with spells) # 1048576 - Anything related to loot # 2097152 - Anything related to guilds |