Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed methods calls from CustomDamageSource to ElectricalDamage

Browse source
This commit is contained in:
Robert S 2014-04-14 20:36:27 -04:00
parent b082997714
commit 59c2eba174
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
electrical/src/main/scala/resonantinduction/electrical/tesla/TileTesla.java
View file

@ -34,6 +34,7 @@ import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.IPacketSender; import calclavia.lib.network.IPacketSender;
import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketHandler;
import calclavia.lib.prefab.CustomDamageSource; import calclavia.lib.prefab.CustomDamageSource;
import calclavia.lib.prefab.damage.ElectricalDamage;
import calclavia.lib.prefab.tile.TileElectrical; import calclavia.lib.prefab.tile.TileElectrical;
import calclavia.lib.render.EnumColor; import calclavia.lib.render.EnumColor;
@ -242,7 +243,7 @@ public class TileTesla extends TileElectrical implements IMultiBlockStructure<Ti
{ {
if (mop.entityHit instanceof EntityLivingBase) if (mop.entityHit instanceof EntityLivingBase)
{ {
CustomDamageSource.electrocuteEntity(mop.entityHit, this, UniversalElectricity.DEFAULT_VOLTAGE * 4, 1); ElectricalDamage.electrocuteEntity(mop.entityHit, this, UniversalElectricity.DEFAULT_VOLTAGE * 4, 1);
Electrical.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).clone().translate(0.5), new Vector3(mop.entityHit)); Electrical.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).clone().translate(0.5), new Vector3(mop.entityHit));
} }
} }

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

@ -19,6 +19,7 @@ import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.electricity.IElectricalNetwork; import universalelectricity.api.electricity.IElectricalNetwork;
import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IConductor;
import calclavia.lib.prefab.CustomDamageSource; import calclavia.lib.prefab.CustomDamageSource;
import calclavia.lib.prefab.damage.ElectricalDamage;
import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataInput;
import codechicken.lib.data.MCDataOutput; import codechicken.lib.data.MCDataOutput;
import codechicken.multipart.IRedstonePart; import codechicken.multipart.IRedstonePart;
@ -89,7 +90,7 @@ public abstract class PartAdvancedWire extends PartConductor
public void onEntityCollision(Entity entity) public void onEntityCollision(Entity entity)
{ {
if (!this.isInsulated() && this.getNetwork() instanceof IElectricalNetwork) if (!this.isInsulated() && this.getNetwork() instanceof IElectricalNetwork)
CustomDamageSource.handleElectrocution(entity, this, (IElectricalNetwork) this.getNetwork(), 1); ElectricalDamage.handleElectrocution(entity, this, (IElectricalNetwork) this.getNetwork(), 1);
} }
@Override @Override