mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 13:10:13 +00:00
Fixed server crash with killer joe.
This commit is contained in:
1 parent
5082e58cad
commit
6d6a09bc3b
1 file changed
+28
-25
@@ -99,7 +99,9 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
|
||||
public void updateEntity() {
|
||||
updateArmSwingProgress();
|
||||
hooverXP();
|
||||
getAttackera().onUpdate();
|
||||
if(worldObj != null && worldObj.isRemote) {
|
||||
getAttackera().onUpdate();
|
||||
}
|
||||
super.updateEntity();
|
||||
}
|
||||
|
||||
@@ -334,30 +336,31 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
|
||||
@Override
|
||||
protected boolean doPull(ForgeDirection dir) {
|
||||
boolean res = super.doPull(dir);
|
||||
BlockCoord loc = getLocation().getLocation(dir);
|
||||
IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc);
|
||||
if(target != null) {
|
||||
FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite());
|
||||
if(infos != null) {
|
||||
for (FluidTankInfo info : infos) {
|
||||
if(info.fluid != null && info.fluid.amount > 0) {
|
||||
if(canFill(dir, info.fluid.getFluid())) {
|
||||
FluidStack canPull = info.fluid.copy();
|
||||
canPull.amount = Math.min(IO_MB_TICK, canPull.amount);
|
||||
FluidStack drained = target.drain(dir.getOpposite(), canPull, false);
|
||||
if(drained != null && drained.amount > 0) {
|
||||
int filled = fill(dir, drained, false);
|
||||
if(filled > 0) {
|
||||
drained = target.drain(dir.getOpposite(), filled, true);
|
||||
fill(dir, drained, true);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// BlockCoord loc = getLocation().getLocation(dir);
|
||||
// IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc);
|
||||
// if(target != null) {
|
||||
// FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite());
|
||||
// if(infos != null) {
|
||||
// for (FluidTankInfo info : infos) {
|
||||
// if(info.fluid != null && info.fluid.amount > 0) {
|
||||
// if(canFill(dir, info.fluid.getFluid())) {
|
||||
// FluidStack canPull = info.fluid.copy();
|
||||
// canPull.amount = Math.min(IO_MB_TICK, canPull.amount);
|
||||
// FluidStack drained = target.drain(dir.getOpposite(), canPull, false);
|
||||
// if(drained != null && drained.amount > 0) {
|
||||
// int filled = fill(dir, drained, false);
|
||||
// if(filled > 0) {
|
||||
// drained = target.drain(dir.getOpposite(), filled, true);
|
||||
// fill(dir, drained, true);
|
||||
// return res;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
FluidUtil.doPull(this, dir, IO_MB_TICK);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user