upstream/Electro-Magic-Tools
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Electro-Magic-Tools.git synced 2026-11-13 17:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Missing File Update for Focus Upgrades

Browse Source
This commit is contained in:
Jens Bauer committed 2015-12-14 23:30:00 +01:00
1 parent 2b38ed2f2b
commit c80a774da7
1 file changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/tombenpotter/emt/common/entities/EntityLaser.java
+11 -2
View File
@@ -30,6 +30,8 @@ public class EntityLaser extends Entity implements IProjectile {
public Entity shootingEntity;
private int ticksInGround;
private int ticksInAir;
private float explosionStrengthMod = 1.f;
public EntityLaser(World par1World) {
super(par1World);
@@ -85,6 +87,11 @@ public class EntityLaser extends Entity implements IProjectile {
this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI));
this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, par3 * 1.5F, 1.0F);
}
public void setExplosionStrengthModifier(float f)
{
explosionStrengthMod = f;
}
protected void entityInit() {
this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
@@ -164,7 +171,7 @@ public class EntityLaser extends Entity implements IProjectile {
Block j = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile);
int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile);
if (!this.worldObj.isRemote) {
this.worldObj.createExplosion(this, (int) this.posX, (int) this.posY, (int) this.posZ, 3, true);
this.worldObj.createExplosion(this, (int) this.posX, (int) this.posY, (int) this.posZ, 3 * explosionStrengthMod, true);
this.setDead();
}
@@ -318,6 +325,7 @@ public class EntityLaser extends Entity implements IProjectile {
nbt.setByte("inTile", (byte) Block.getIdFromBlock(this.inTile));
nbt.setByte("inData", (byte) this.inData);
nbt.setBoolean("inGround", this.inGround);
nbt.setFloat("explosionStrengthMod", this.explosionStrengthMod);
}
public void readEntityFromNBT(NBTTagCompound nbt) {
@@ -327,13 +335,14 @@ public class EntityLaser extends Entity implements IProjectile {
this.inTile = Block.getBlockById(nbt.getByte("inTile") & 255);
this.inData = nbt.getByte("inData") & 255;
this.inGround = nbt.getBoolean("inGround");
this.explosionStrengthMod = nbt.getFloat("explosionStrengthMod");
}
public void onCollide(Entity par1Entity) {
if (!this.worldObj.isRemote)
;
{
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true);
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3*explosionStrengthMod, true);
}
}