Merge pull request #143 from azerothcore/master

Update (crashfix movement generator)

src/server/apps/worldserver/worldserver.conf.dist

@@ -718,7 +718,6 @@ Logger.spells.scripts=2,Console Errors
 Logger.playerbots=5,Console Playerbots
 #Logger.achievement=4,Console Server
 #Logger.addon=4,Console Server
-#Logger.ahbot=4,Console Server
 #Logger.auctionHouse=4,Console Server
 #Logger.autobroadcast=4, Console Server
 #Logger.bg.arena=4,Console Server

src/server/game/Entities/Player/Player.cpp

@@ -12346,6 +12346,10 @@ bool Player::IsSpellFitByClassAndRace(uint32 spell_id) const
         if (_spell_idx->second->ClassMask && (_spell_idx->second->ClassMask & classmask) == 0)
             continue;
 
+        // skip wrong class and race skill saved in SkillRaceClassInfo.dbc
+        if (!GetSkillRaceClassInfo(_spell_idx->second->SkillLine, getRace(), getClass()))
+            continue;
+
         return true;
     }
 

src/server/game/Entities/Unit/Unit.h

@@ -2052,8 +2052,6 @@ public:
     void OutDebugInfo() const;
     std::string GetDebugInfo() const override;
 
-    bool m_cannotReachTarget;
-
     //----------- Public variables ----------//
     uint32 m_extraAttacks;
     DualWieldMode _dualWieldMode;

src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp

@@ -389,10 +389,10 @@ void FlightPathMovementGenerator::LoadPath(Player* player)
         LOG_ERROR("movement.flightpath", "Failed to build correct path for player: {}. Current node: {}, max nodes: {}. Paths: {}. Player pos: {}.", player->GetGUID().ToString(), GetCurrentNode(), i_path.size(), paths, player->GetPosition().ToString());
 
         // Lets choose the second last element so that a player would still have some flight.
-        if (int(i_path.size()) - 2 >= 0)
+        if (i_path.size() >= 2)
             i_currentNode = uint32(i_path.size() - 2);
         else
-            i_currentNode = uint32(i_path.size() - 1);
+            i_currentNode = 0;
     }
 }