diff --git a/mine/client.lua b/mine/client.lua index c0068a9..6396d05 100644 --- a/mine/client.lua +++ b/mine/client.lua @@ -512,17 +512,11 @@ function enqueueForJob2() _, job, _ = rednet.receive() if job then if job == "nojobs" then + updateState({ state = "Waiting for job... (retrying)" }) sleep(3) else return tonumber(job) end - else - if not retrying then - retrying = true - --print("No job received. I will keep retrying.") - --turtlestate["state"] = "Waiting for job... (retrying)" - updateState({ state = "Waiting for job... (retrying)" }) - end end end end @@ -594,9 +588,6 @@ function goToJob2(job) digSafe(turtle.inspectUp, turtle.digUp) end goToCoordXZ2(jobX, jobZ, extraaction) - --moveSafe(turtle.down, turtle.inspectDown, turtle.digDown) - --moveSafe(turtle.up, turtle.inspectUp, turtle.digUp) - --moveSafe(turtle.up, turtle.inspectUp, turtle.digUp) end function unloadStuffs() @@ -671,15 +662,6 @@ function reportDuty2() rednet.send(server, "report") rednet.send(server, tostring(id)) rednet.send(server, tostring(fuelconsumed)) - --while true do - -- updateState({ state = "Waiting for thanks..." }) - -- sender, message, proto = rednet.receive("jobcomplete", 2) - -- if message == "thanks" then - -- break - -- else - -- sleep(1) - -- end - --end for k, v in pairs(turtlestate["ores"]) do rednet.send(server, k) rednet.send(server, v) diff --git a/mine/server.lua b/mine/server.lua index f6af4c5..125518d 100644 --- a/mine/server.lua +++ b/mine/server.lua @@ -33,7 +33,6 @@ while true do print("Found job request. Offering "..tostring(job)) else rednet.send(receiver, "nojobs") - print("Found job request. Rejecting...") end elseif message == "report" then _, job, _ = rednet.receive()