upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-14 01:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Reverted flower binding cache handling changes from a month ago. I have no idea if this will fix anything but we might as well try."

Browse Source 
This reverts commit a242e382b4.
This commit is contained in:
Lizbeth Rika committed 2015-06-08 23:00:39 +01:00
1 parent b8d456cc1b
commit 6211bb967f
3 files changed
+21 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/api/package-info.java
+1 -1
View File
@@ -1,4 +1,4 @@
@API(owner = "Botania", apiVersion = "51", provides = "BotaniaAPI")
@API(owner = "Botania", apiVersion = "50", provides = "BotaniaAPI")
package vazkii.botania.api;
import cpw.mods.fml.common.API;
src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java
+10 -6
View File
@@ -91,13 +91,17 @@ public class SubTileFunctional extends SubTileEntity {
if(linkedPool == null) {
needsNew = true;
if(cachedPoolCoordinates != null && supertile.getWorldObj().blockExists(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ)) {
TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ);
if(tileAt != null && tileAt instanceof IManaPool) {
linkedPool = tileAt;
needsNew = false;
if(cachedPoolCoordinates != null) {
needsNew = false;
if(supertile.getWorldObj().blockExists(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ)) {
needsNew = true;
TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ);
if(tileAt != null && tileAt instanceof IManaPool) {
linkedPool = tileAt;
needsNew = false;
}
cachedPoolCoordinates = null;
}
cachedPoolCoordinates = null;
}
}
src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java
+10 -6
View File
@@ -84,13 +84,17 @@ public class SubTileGenerating extends SubTileEntity {
if(linkedCollector == null) {
needsNew = true;
if(cachedCollectorCoordinates != null && supertile.getWorldObj().blockExists(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ)) {
TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ);
if(tileAt != null && tileAt instanceof IManaCollector) {
linkedCollector = tileAt;
needsNew = false;
if(cachedCollectorCoordinates != null) {
needsNew = false;
if(supertile.getWorldObj().blockExists(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ)) {
needsNew = true;
TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ);
if(tileAt != null && tileAt instanceof IManaCollector) {
linkedCollector = tileAt;
needsNew = false;
}
cachedCollectorCoordinates = null;
}
cachedCollectorCoordinates = null;
}
}