diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-12 06:49:59 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-12 06:49:59 +0200 |
| commit | f6dc74ca534bd488a3c537c09a1e6bb5e73593a4 (patch) | |
| tree | 756b4d3a63e4fcd8b4fa87ffa943ae9f4dd7340e /src/main/java | |
| parent | b0cbd07d6ebb8c1489ce4b664e2eb9d22497e687 (diff) | |
| download | GT5-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')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 8 |
2 files changed, 2 insertions, 11 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; diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index d8d5060370..f6d4ca65a7 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -74,7 +74,6 @@ import java.text.DateFormat; import java.util.*; public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { - public static HashMap<Integer,Long> serverSideDimensionWiseTickCounter =new HashMap<>(); private static final EnumSet<OreGenEvent.GenerateMinable.EventType> PREVENTED_ORES = EnumSet.of(OreGenEvent.GenerateMinable.EventType.COAL, new OreGenEvent.GenerateMinable.EventType[]{OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD, OreGenEvent.GenerateMinable.EventType.DIAMOND, OreGenEvent.GenerateMinable.EventType.REDSTONE, OreGenEvent.GenerateMinable.EventType.LAPIS, @@ -1249,13 +1248,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } } - int dimID=aEvent.world.provider.dimensionId; - if(serverSideDimensionWiseTickCounter.containsKey(dimID)){ - serverSideDimensionWiseTickCounter.put(dimID, serverSideDimensionWiseTickCounter.get(dimID)+1); - }else{ - serverSideDimensionWiseTickCounter.put(dimID,0L); - } - GT_Pollution.onWorldTick(aEvent); } } |