Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x

This commit is contained in:
asiekierka 2014-12-30 10:02:52 +01:00
commit 7361a72710

View file

@ -264,6 +264,8 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry {
if (stations.containsKey(index)) {
if (station.robotTaking() != null) {
station.robotTaking().setDead();
} else if (station.robotIdTaking() != EntityRobotBase.NULL_ROBOT_ID) {
stationsTakenByRobot.get(station.robotIdTaking()).remove(index);
}
stations.remove(index);