Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft

[chemicraft/chemicraft.git] / src / chemicraft / entity / EntityAtomsGrenade.java

diff --git a/src/chemicraft/entity/EntityAtomsGrenade.java b/src/chemicraft/entity/EntityAtomsGrenade.java
deleted file mode 100644 (file)
index deb72b1..0000000
--- a/src/chemicraft/entity/EntityAtomsGrenade.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package chemicraft.entity;
-
-import java.util.Iterator;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.projectile.EntityThrowable;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
-public class EntityAtomsGrenade extends EntityThrowable
-{
-
-       private float explodeSize;
-       private boolean isExplode;
-       private boolean onFire;
-       private boolean isNuke;
-
-       public EntityAtomsGrenade(World par1World, EntityLiving par2EntityLiving, boolean par3, boolean par4, boolean par5) {
-               super(par1World, par2EntityLiving);
-               this.isExplode = par3;
-               this.onFire = par4;
-               this.isNuke = par5;
-       }
-
-       @Override
-       public void onUpdate(){
-               super.onUpdate();
-       }
-
-       @SuppressWarnings("unchecked")
-       @Override
-       protected void onImpact(MovingObjectPosition par1MovingObjectPosition)
-       {
-
-               if(isExplode){
-                       this.explodeSize = 3.0F;
-               }
-
-               if(isNuke){
-                       this.explodeSize = 20.0F;
-               }
-
-               if (par1MovingObjectPosition.entityHit != null) {
-                       par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_85052_h()), 2);
-                       par1MovingObjectPosition.entityHit.setFire(5);
-               }
-
-               if (!this.worldObj.isRemote && !isNuke) {
-                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
-                       this.isDead = true;
-               }else if(!this.worldObj.isRemote && isNuke){
-                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
-                       Iterator<EntityLiving> itr = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(30, 30, 30)).iterator();
-                       while(itr.hasNext()){
-                               EntityLiving entity = itr.next();
-                               double dx = Math.abs(entity.posX - this.posX);
-                               double dy = Math.abs(entity.posY - this.posY);
-                               double dz = Math.abs(entity.posZ - this.posZ);
-                               int distance = (int)Math.sqrt( Math.pow(dx, 2) + Math.pow(dy, 2) + Math.pow(dz, 2) );
-                               if(30 - distance >= 0){
-                                       entity.addPotionEffect(new PotionEffect(2, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(4, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(18, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                                       entity.addPotionEffect(new PotionEffect(19, (60 + (30 - distance)) * 20, (30 - distance) / 5));
-                               }
-                       }
-                       this.isDead = true;
-               }
-
-       }
-
-}