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

Wire electrocution now drains 100j per damage done

Browse source
This commit is contained in:
Robert S 2014-04-14 19:38:59 -04:00
parent c04955cd8a
commit ade00d97dc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
electrical/src/main/scala/resonantinduction/electrical/wire/PartAdvancedWire.java
View file

@ -89,17 +89,18 @@ public abstract class PartAdvancedWire extends PartConductor
@Override @Override
public void onEntityCollision(Entity entity) public void onEntityCollision(Entity entity)
{ {
if (!this.isInsulated()) if (!this.isInsulated() && this.getNetwork() instanceof IElectricalNetwork)
{ {
float damage = 0; float damage = 0;
if (this.getNetwork() instanceof IElectricalNetwork && this.getNetwork().getRequest() > 0) if (this.getNetwork().getRequest() > 0)
{
damage = ((IElectricalNetwork) this.getNetwork()).getVoltage() / UniversalElectricity.DEFAULT_VOLTAGE; damage = ((IElectricalNetwork) this.getNetwork()).getVoltage() / UniversalElectricity.DEFAULT_VOLTAGE;
}
if (damage > 0) if (damage > 0)
{
entity.attackEntityFrom(CustomDamageSource.electrocution, Math.min(damage, 10)); entity.attackEntityFrom(CustomDamageSource.electrocution, Math.min(damage, 10));
this.getNetwork().setBuffer((long) Math.max(0, this.getNetwork().getBuffer() - damage * 100));
}
} }
} }