tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13 from Thorfusion/maggi373-patch-1

Browse source 
reverted changes
This commit is contained in:
Magnar 2020-08-03 20:14:27 +02:00 committed by GitHub
commit f783b947dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java
View file

@ -1,6 +1,5 @@
package mekanism.generators.common.tile;
import buildcraft.api.core.Position;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
@ -14,9 +13,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import rpcore.api.DimensionAPI;
import rpcore.constants.CelestialType;
import rpcore.module.dimension.ForgeDimension;
public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock
{
@ -40,20 +36,15 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou
{
ChargeUtils.charge(0, this);
ForgeDimension dim = ((ForgeDimension)DimensionAPI.getForgeDimension(this.worldObj.provider.dimensionId));
if (dim != null && (dim.getType().equals(CelestialType.System) || dim.getType().equals(CelestialType.Cluster)) && getActive()) {
setActive(false);
} else {
if(ticker % 20 == 0)
{
setActive((currentMultiplier = getMultiplier()) > 0);
}
if(getActive())
{
setEnergy(electricityStored + (generators.windGenerationMin*currentMultiplier));
}
}
if(ticker % 20 == 0)
{
setActive((currentMultiplier = getMultiplier()) > 0);
}
if(getActive())
{
setEnergy(electricityStored + (generators.windGenerationMin*currentMultiplier));
}
}
}