veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-06-21 16:09:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: veitR:1e07ef3d02ad914a2302d3fcd49dba4be16036ea
Branches Tags
veitR:master
veitR:test-staging
veitR:feature/new_rpg_and_nav_2
veitR:feature/new_rpg_and_nav_3
veitR:feature/new_rpg_and_nav_4_bash
veitR:feature/new_rpg_and_nav_3_bash
veitR:TravelSystem-pr
veitR:fixGuildArena
veitR:master_v16
..
compare: veitR:9ca851f83785e8ea83ef107ba670b61facf67273
Branches Tags
veitR:test-staging
veitR:master
veitR:feature/new_rpg_and_nav_2
veitR:feature/new_rpg_and_nav_3
veitR:feature/new_rpg_and_nav_4_bash
veitR:feature/new_rpg_and_nav_3_bash
veitR:TravelSystem-pr
veitR:fixGuildArena
veitR:master_v16

No commits in common. "1e07ef3d02ad914a2302d3fcd49dba4be16036ea" and "9ca851f83785e8ea83ef107ba670b61facf67273" have entirely different histories.
1e07ef3d02 ... 9ca851f837

1 changed files with 1 additions and 11 deletions
Show Stats Expand all files Collapse all files

12
src/Mgr/Travel/TravelNode.cpp
View File

@ -1772,13 +1772,6 @@ void TravelNodeMap::generateTaxiPaths()
TravelNodePath travelPath(0.1f, totalTime, (uint8)TravelNodePathType::flightPath, i, true); TravelNodePath travelPath(0.1f, totalTime, (uint8)TravelNodePathType::flightPath, i, true);
travelPath.setPath(ppath); travelPath.setPath(ppath);
// Preserve existing walk paths — taxi-position lookup can resolve to
// a non-FM node (innkeeper, subzone), and overwriting its walk path
// with a flight path makes the walkable connection disappear.
if (startNode->hasPathTo(endNode) &&
startNode->getPathTo(endNode)->getPathType() == TravelNodePathType::walk)
continue;
startNode->setPathTo(endNode, travelPath); startNode->setPathTo(endNode, travelPath);
} }
} }
@ -2200,9 +2193,6 @@ void TravelNodeMap::saveNodeStore()
PlayerbotsDatabase.CommitTransaction(pathTrans); PlayerbotsDatabase.CommitTransaction(pathTrans);
LOG_INFO("playerbots", ">> Saved {} travelNode Paths, {} points.", paths, points); LOG_INFO("playerbots", ">> Saved {} travelNode Paths, {} points.", paths, points);
LOG_INFO("playerbots",
">> NOTE: writes are queued ASYNC. Run '.server shutdown 1' to flush "
"the queue; killing the process now will lose pending rows.");
} }
void TravelNodeMap::LoadNodeStore() void TravelNodeMap::LoadNodeStore()
@ -2221,7 +2211,7 @@ void TravelNodeMap::LoadNodeStore()
TravelNode* node = addNode(WorldPosition(fields[2].Get<uint32>(), fields[3].Get<float>(), TravelNode* node = addNode(WorldPosition(fields[2].Get<uint32>(), fields[3].Get<float>(),
fields[4].Get<float>(), fields[5].Get<float>()), fields[4].Get<float>(), fields[5].Get<float>()),
fields[1].Get<std::string>(), true, false); fields[1].Get<std::string>(), true);
if (fields[6].Get<bool>()) if (fields[6].Get<bool>())
node->setLinked(true); node->setLinked(true);