Merge pull request #2488 from hea3ven/6.4.x

fix interface overriding an obfuscated method, fixes #2486
This commit is contained in:
Adrian Siekierka 2015-02-24 06:15:26 +01:00
commit 5610f8195e
2 changed files with 2 additions and 2 deletions

View file

@ -25,7 +25,7 @@ public interface IPipeTile extends IInjectable {
PipeType getPipeType();
World getWorldObj();
World getWorld();
int x();

View file

@ -52,7 +52,7 @@ public class ActionRobotGotoStation extends BCStatement implements IActionIntern
}
IPipeTile tile = (IPipeTile) container.getTile();
RobotRegistry registry = RobotRegistry.getRegistry(tile.getWorldObj());
RobotRegistry registry = RobotRegistry.getRegistry(tile.getWorld());
for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) {
DockingStation station = RobotUtils.getStation(tile, d);