From 6765756e2d759eaa4d4d339d4151e85b4e6f02a5 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 8 Mar 2016 18:55:40 +0000 Subject: [PATCH] Some more fixes to the energy net --- src/main/java/techreborn/events/TRTickHandler.java | 6 ++++-- src/main/java/techreborn/power/TRPowerNet.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/events/TRTickHandler.java b/src/main/java/techreborn/events/TRTickHandler.java index b3720e5b9..42ef912f9 100644 --- a/src/main/java/techreborn/events/TRTickHandler.java +++ b/src/main/java/techreborn/events/TRTickHandler.java @@ -32,8 +32,10 @@ public class TRTickHandler { @SubscribeEvent public void worldTick(TickEvent.WorldTickEvent e) { - if(!e.world.isRemote) - MinecraftForge.EVENT_BUS.post(new PowerTickEvent()); + if(e.world.isRemote){ + return; + } + MinecraftForge.EVENT_BUS.post(new PowerTickEvent()); } } diff --git a/src/main/java/techreborn/power/TRPowerNet.java b/src/main/java/techreborn/power/TRPowerNet.java index 4d488f72d..5e954c59c 100644 --- a/src/main/java/techreborn/power/TRPowerNet.java +++ b/src/main/java/techreborn/power/TRPowerNet.java @@ -199,7 +199,7 @@ public class TRPowerNet { public int addEnergy(int max) { int total = 0; - if (tile.canAcceptEnergy(EnumFacing.NORTH)) { + if (tile.canAcceptEnergy(EnumFacing.NORTH) && max > 0) { if (type.tier.ordinal() > tile.getTier().ordinal()) { if (tile instanceof TileEntity) { ((TileEntity) tile).getWorld().createExplosion(new EntityTNTPrimed(((TileEntity) tile).getWorld()), ((TileEntity) tile).getPos().getX(), ((TileEntity) tile).getPos().getY(), ((TileEntity) tile).getPos().getZ(), 2.5F, true);