diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 6 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index a1a537c432..b7d6b0a0fa 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -250,9 +250,9 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile mTransferredVoltage=0; mTransferredAmperageOK=mTransferredAmperage; mTransferredAmperage = 0; - final int dimID=aBaseMetaTileEntity.getWorld().provider.dimensionId; - tickDiff=Math.min((int)(serverSideDimensionWiseTickCounter.get(dimID)-lastTickTime),1); - lastTickTime=serverSideDimensionWiseTickCounter.get(dimID); + + tickDiff=Math.min((int)(serverSideDimensionWiseTickCounter.get(aBaseMetaTileEntity.getWorld().provider.dimensionId)-lastTickTime),1); + lastTickTime=serverSideDimensionWiseTickCounter.get(aBaseMetaTileEntity.getWorld().provider.dimensionId); if(lastTickDiff<tickDiff) mOverheat=(short)Math.max(0,mOverheat-100); lastTickDiff=tickDiff; diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 844f1ef1a8..d8d5060370 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1249,10 +1249,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } } - final int dimID=aEvent.world.provider.dimensionId; - if(serverSideDimensionWiseTickCounter.containsKey(dimID)) + int dimID=aEvent.world.provider.dimensionId; + if(serverSideDimensionWiseTickCounter.containsKey(dimID)){ serverSideDimensionWiseTickCounter.put(dimID, serverSideDimensionWiseTickCounter.get(dimID)+1); - else serverSideDimensionWiseTickCounter.put(dimID,0L); + }else{ + serverSideDimensionWiseTickCounter.put(dimID,0L); + } GT_Pollution.onWorldTick(aEvent); } |