aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-09-12 06:49:59 +0200
committerTechnus <daniel112092@gmail.com>2017-09-12 06:49:59 +0200
commitf6dc74ca534bd488a3c537c09a1e6bb5e73593a4 (patch)
tree756b4d3a63e4fcd8b4fa87ffa943ae9f4dd7340e /src/main/java/gregtech/api/metatileentity
parentb0cbd07d6ebb8c1489ce4b664e2eb9d22497e687 (diff)
downloadGT5-Unofficial-f6dc74ca534bd488a3c537c09a1e6bb5e73593a4.tar.gz
GT5-Unofficial-f6dc74ca534bd488a3c537c09a1e6bb5e73593a4.tar.bz2
GT5-Unofficial-f6dc74ca534bd488a3c537c09a1e6bb5e73593a4.zip
Revert "Implement tick counter?"
This reverts commit 0d9d2040bc43f4e18d227b3c51a3edc4f9994747.
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java5
1 files changed, 2 insertions, 3 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 b7d6b0a0fa..34e2303937 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
@@ -33,7 +33,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.common.GT_Proxy.serverSideDimensionWiseTickCounter;
public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTileEntityCable {
public final float mThickNess;
@@ -251,8 +250,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
mTransferredAmperageOK=mTransferredAmperage;
mTransferredAmperage = 0;
- tickDiff=Math.min((int)(serverSideDimensionWiseTickCounter.get(aBaseMetaTileEntity.getWorld().provider.dimensionId)-lastTickTime),1);
- lastTickTime=serverSideDimensionWiseTickCounter.get(aBaseMetaTileEntity.getWorld().provider.dimensionId);
+ tickDiff=Math.min((int)(aBaseMetaTileEntity.getWorld().getTotalWorldTime()-lastTickTime),1);
+ lastTickTime=aBaseMetaTileEntity.getWorld().getTotalWorldTime();
if(lastTickDiff<tickDiff)
mOverheat=(short)Math.max(0,mOverheat-100);
lastTickDiff=tickDiff;