helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pathfinding to coordinates

Browse source 
- Now possible to walk to given coordinates
- Fix sending location before it is received
This commit is contained in:
ORelio 2015-12-13 21:58:55 +01:00
parent b0c8f82697
commit 902b04656c
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MinecraftClient/Mapping/Movement.cs
View file

@ -99,7 +99,7 @@ namespace MinecraftClient.Mapping
public static Queue<Location> CalculatePath(World world, Location start, Location goal, bool allowUnsafe = false) public static Queue<Location> CalculatePath(World world, Location start, Location goal, bool allowUnsafe = false)
{ {
HashSet<Location> ClosedSet = new HashSet<Location>(); // The set of locations already evaluated. HashSet<Location> ClosedSet = new HashSet<Location>(); // The set of locations already evaluated.
HashSet<Location> OpenSet = new HashSet<Location>(); // The set of tentative nodes to be evaluated, initially containing the start node HashSet<Location> OpenSet = new HashSet<Location>(new []{ start }); // The set of tentative nodes to be evaluated, initially containing the start node
Dictionary<Location, Location> Came_From = new Dictionary<Location, Location>(); // The map of navigated nodes. Dictionary<Location, Location> Came_From = new Dictionary<Location, Location>(); // The map of navigated nodes.
Dictionary<Location, int> g_score = new Dictionary<Location, int>(); //:= map with default value of Infinity Dictionary<Location, int> g_score = new Dictionary<Location, int>(); //:= map with default value of Infinity
@ -117,13 +117,14 @@ namespace MinecraftClient.Mapping
.OrderBy(pair => pair.Value).First().Key; .OrderBy(pair => pair.Value).First().Key;
if (current == goal) if (current == goal)
{ //reconstruct_path(Came_From, goal) { //reconstruct_path(Came_From, goal)
Queue<Location> total_path = new Queue<Location>(new Location[] { current }); List<Location> total_path = new List<Location>(new[] { current });
while (Came_From.ContainsKey(current)) while (Came_From.ContainsKey(current))
{ {
current = Came_From[current]; current = Came_From[current];
total_path.Enqueue(current); total_path.Add(current);
} }
return total_path; total_path.Reverse();
return new Queue<Location>(total_path);
} }
OpenSet.Remove(current); OpenSet.Remove(current);
ClosedSet.Add(current); ClosedSet.Add(current);

4
MinecraftClient/McTcpClient.cs
View file

@ -32,6 +32,7 @@ namespace MinecraftClient
public void BotClear() { bots.Clear(); } public void BotClear() { bots.Clear(); }
private object locationLock = new object(); private object locationLock = new object();
private bool locationReceived = false;
private World world = new World(); private World world = new World();
private Queue<Location> steps; private Queue<Location> steps;
private Queue<Location> path; private Queue<Location> path;
@ -356,6 +357,7 @@ namespace MinecraftClient
this.location += location; this.location += location;
} }
else this.location = location; else this.location = location;
locationReceived = true;
} }
} }
@ -468,7 +470,7 @@ namespace MinecraftClient
} }
} }
if (Settings.TerrainAndMovements) if (Settings.TerrainAndMovements && locationReceived)
{ {
lock (locationLock) lock (locationLock)
{ {