Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix robot dupe when unloaded on a station other than the main link

Browse source
This commit is contained in:
Hea3veN 2015-03-09 19:13:42 -03:00
parent d77aa4e9fa
commit 6b3409736d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/robots/RobotRegistry.java
View file

@ -188,7 +188,7 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry {
releaseResources(robot, forceAll, false); releaseResources(robot, forceAll, false);
} }
private synchronized void releaseResources(EntityRobotBase robot, boolean forceAll, boolean resetMainLink) { private synchronized void releaseResources(EntityRobotBase robot, boolean forceAll, boolean resetEntities) {
markDirty(); markDirty();
if (resourcesTakenByRobot.containsKey(robot.getRobotId())) { if (resourcesTakenByRobot.containsKey(robot.getRobotId())) {
@ -213,7 +213,7 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry {
if (!d.canRelease()) { if (!d.canRelease()) {
if (forceAll) { if (forceAll) {
d.unsafeRelease(robot); d.unsafeRelease(robot);
} else if (resetMainLink && d.isMainStation() && d.robotIdTaking() == robot.getRobotId()) { } else if (resetEntities && d.robotIdTaking() == robot.getRobotId()) {
d.invalidateRobotTakingEntity(); d.invalidateRobotTakingEntity();
} }
} else { } else {