diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 34e136f7..3b76b775 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -26,6 +26,7 @@ Bugs - #1112 (new) Dimentional transceiver doesn't save the selected channels on pickup - #1115 Glass Painted Dark Pressure Plate doesn't render in inventory or as item - #1125 Improved client side performance when pressurized fluid conduits are transferring small volumes of fluid +- #1121 Killer Joe XP bar doesn't update if not active diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 2cc95fae..9e9a5941 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -110,10 +110,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle @Override protected boolean processTasks(boolean redstoneCheckPassed) { - if(!redstoneCheckPassed) { - return false; - } - if(worldObj.getTotalWorldTime() % 10 != 0) { return false; } @@ -126,6 +122,10 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this); xpCon.setDirty(false); } + + if(!redstoneCheckPassed) { + return false; + } if(fuelTank.getFluidAmount() < fuelTank.getCapacity() * 0.7f) { return false; @@ -178,7 +178,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle hooverXP(entity); } else { double d = 1 - (Math.max(0.1, totalDistance) / maxDist); - double speed = 0.005 + (d * 0.02); + double speed = 0.01 + (d * 0.02); entity.motionX += xDist / totalDistance * speed; entity.motionZ += zDist / totalDistance * speed;