Fix #1153 crash from interface methods named getWorld

This commit is contained in:
mezz committed 2016-05-11 22:00:49 -07:00
1 parent 0ae2e36e90
commit 5cc181d4c7
43 files changed
+92 -133

No files matched your search

@@ -401,13 +401,13 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
@Override
public float getExactTemperature() {
BlockPos coords = getReferenceCoord();
return ForestryAPI.climateManager.getTemperature(getWorld(), coords);
return ForestryAPI.climateManager.getTemperature(getWorldObj(), coords);
}
@Override
public float getExactHumidity() {
BlockPos coords = getReferenceCoord();
return ForestryAPI.climateManager.getHumidity(getWorld(), coords);
return ForestryAPI.climateManager.getHumidity(getWorldObj(), coords);
}
private Vec3i offset;
@@ -435,11 +435,6 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
return area;
}
@Override
public World getWorld() {
return worldObj;
}
@Override
public String getUnlocalizedType() {
return "for.multiblock.farm.type";