Merge branch '3.3.5' into 4.3.4
Conflicts: sql/base/dev/world_database.sql sql/updates/world/2015_07_14_00_world.sql sql/updates/world/2015_07_14_01_world_335.sql sql/updates/world/2015_07_19_00_world_2015_07_18_04.sql sql/updates/world/2015_07_19_05_world.sql sql/updates/world/2015_07_21_00_world.sql sql/updates/world/2015_07_24_00_world.sql sql/updates/world/2015_07_24_01_world.sql sql/updates/world/2015_07_24_02_world.sql sql/updates/world/2015_07_24_03_world.sql sql/updates/world/2015_07_24_04_world.sql sql/updates/world/2015_07_24_05_world.sql sql/updates/world/2015_07_25_03_world.sql sql/updates/world/2015_07_25_04_world.sql src/server/collision/Management/MMapManager.cpp src/server/collision/Management/MMapManager.h src/server/game/Battlefield/Battlefield.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Guilds/Guild.h src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/SpellMgr.cpp src/server/game/Weather/WeatherMgr.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/shared/Utilities/Util.cpp
This commit is contained in:
commit
86eb651757
156 files changed
+1402
-967
No files matched your search
@@ -1340,8 +1340,8 @@ public:
|
||||
|
||||
static bool HandleMaxSkillCommand(ChatHandler* handler, char const* /*args*/)
|
||||
{
|
||||
Player* SelectedPlayer = handler->getSelectedPlayer();
|
||||
if (!SelectedPlayer)
|
||||
Player* player = handler->getSelectedPlayerOrSelf();
|
||||
if (!player)
|
||||
{
|
||||
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
|
||||
handler->SetSentErrorMessage(true);
|
||||
@@ -1349,7 +1349,7 @@ public:
|
||||
}
|
||||
|
||||
// each skills that have max skill value dependent from level seted to current level max skill value
|
||||
SelectedPlayer->UpdateSkillsToMaxSkillsForLevel();
|
||||
player->UpdateSkillsToMaxSkillsForLevel();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user