tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed EM contractor not sucking things in

Browse source
This commit is contained in:
Calclavia 2013-08-05 15:48:08 -04:00
parent dce4307e03
commit 64bc122890
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -124,12 +124,12 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
}
}
if (this.linked != null && !this.linked.isInvalid())
if (!this.suck)
{
ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(this).translate(0.5), new Vector3(this).translate(new Vector3(this.getDirection())).translate(0.5), TileEntityTesla.dyeColors[dyeID]);
if (!this.suck)
if (this.linked != null && !this.linked.isInvalid())
{
ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(this).translate(0.5), new Vector3(this).translate(new Vector3(this.getDirection())).translate(0.5), TileEntityTesla.dyeColors[dyeID]);
if (this.pathfinder != null)
{
for (int i = 0; i < this.pathfinder.results.size(); i++)
@ -167,6 +167,11 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
}
else
{
if (this.linked != null && !this.linked.isInvalid())
{
ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(this).translate(0.5), new Vector3(this).translate(new Vector3(this.getDirection())).translate(0.5), TileEntityTesla.dyeColors[dyeID]);
}
this.pathfinder = null;
if (operationBounds != null)

1
src/resonantinduction/multimeter/TileEntityMultimeter.java
View file

@ -114,6 +114,7 @@ public class TileEntityMultimeter extends TileEntityBase implements IPacketRecei
this.toggleMode();
break;
case 3:
System.out.println(this.energyLimit);
this.energyLimit = input.readFloat();
break;
}