From 82106411b70eddd19e182ae05a91f582b8df0efa Mon Sep 17 00:00:00 2001 From: Rseifert Date: Mon, 16 Jul 2012 14:12:51 -0400 Subject: [PATCH] Deleted code that slipped in --- .../net/minecraft/src/EntityCreeper.java | 192 ------------------ 1 file changed, 192 deletions(-) delete mode 100644 minecraft_server/net/minecraft/src/EntityCreeper.java diff --git a/minecraft_server/net/minecraft/src/EntityCreeper.java b/minecraft_server/net/minecraft/src/EntityCreeper.java deleted file mode 100644 index c466d52a..00000000 --- a/minecraft_server/net/minecraft/src/EntityCreeper.java +++ /dev/null @@ -1,192 +0,0 @@ -package net.minecraft.src; - -public class EntityCreeper extends EntityMob -{ - /** - * The amount of time since the creeper was close enough to the player to ignite - */ - int timeSinceIgnited; - - /** - * Time when this creeper was last in an active state (Messed up code here, probably causes creeper animation to go - * weird) - */ - int lastActiveTime; - - public EntityCreeper(World par1World) - { - super(par1World); - this.texture = "/mob/creeper.png"; - this.tasks.addTask(1, new EntityAISwimming(this)); - this.tasks.addTask(2, new EntityAICreeperSwell(this)); - this.tasks.addTask(3, new EntityAIAvoidEntity(this, EntityOcelot.class, 6.0F, 0.25F, 0.3F)); - this.tasks.addTask(4, new EntityAIAttackOnCollide(this, 0.25F, false)); - this.tasks.addTask(5, new EntityAIWander(this, 0.2F)); - this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F)); - this.tasks.addTask(6, new EntityAILookIdle(this)); - this.targetTasks.addTask(1, new EntityAINearestAttackableTarget(this, EntityPlayer.class, 16.0F, 0, true)); - this.targetTasks.addTask(2, new EntityAIHurtByTarget(this, false)); - } - - /** - * Returns true if the newer Entity AI code should be run - */ - public boolean isAIEnabled() - { - return true; - } - - public int getMaxHealth() - { - return 20; - } - - protected void entityInit() - { - super.entityInit(); - this.dataWatcher.addObject(16, Byte.valueOf((byte) - 1)); - this.dataWatcher.addObject(17, Byte.valueOf((byte)0)); - } - - /** - * (abstract) Protected helper method to write subclass entity data to NBT. - */ - public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeEntityToNBT(par1NBTTagCompound); - - if (this.dataWatcher.getWatchableObjectByte(17) == 1) - { - par1NBTTagCompound.setBoolean("powered", true); - } - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readEntityFromNBT(par1NBTTagCompound); - this.dataWatcher.updateObject(17, Byte.valueOf((byte)(par1NBTTagCompound.getBoolean("powered") ? 1 : 0))); - } - - /** - * Called to update the entity's position/logic. - */ - public void onUpdate() - { - if (this.isEntityAlive()) - { - this.lastActiveTime = this.timeSinceIgnited; - int var1 = this.getCreeperState(); - - if (var1 > 0 && this.timeSinceIgnited == 0) - { - this.worldObj.playSoundAtEntity(this, "random.fuse", 1.0F, 0.5F); - } - - this.timeSinceIgnited += var1; - - if (this.timeSinceIgnited < 0) - { - this.timeSinceIgnited = 0; - } - - if (this.timeSinceIgnited >= 30) - { - this.timeSinceIgnited = 30; - - if (!this.worldObj.isRemote) - { - if (this.getPowered()) - { - //this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 6.0F); - } - else - { - //this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3.0F); - } - - this.setDead(); - } - } - } - - super.onUpdate(); - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected String getHurtSound() - { - return "mob.creeper"; - } - - /** - * Returns the sound this mob makes on death. - */ - protected String getDeathSound() - { - return "mob.creeperdeath"; - } - - /** - * Called when the mob's health reaches 0. - */ - public void onDeath(DamageSource par1DamageSource) - { - super.onDeath(par1DamageSource); - - if (par1DamageSource.getEntity() instanceof EntitySkeleton) - { - this.dropItem(Item.record13.shiftedIndex + this.rand.nextInt(10), 1); - } - } - - public boolean attackEntityAsMob(Entity par1Entity) - { - return true; - } - - /** - * Returns true if the creeper is powered by a lightning bolt. - */ - public boolean getPowered() - { - return this.dataWatcher.getWatchableObjectByte(17) == 1; - } - - /** - * Returns the item ID for the item the mob drops on death. - */ - protected int getDropItemId() - { - return Item.gunpowder.shiftedIndex; - } - - /** - * Returns the current state of creeper, -1 is idle, 1 is 'in fuse' - */ - public int getCreeperState() - { - return this.dataWatcher.getWatchableObjectByte(16); - } - - /** - * Sets the state of creeper, -1 to idle and 1 to be 'in fuse' - */ - public void setCreeperState(int par1) - { - this.dataWatcher.updateObject(16, Byte.valueOf((byte)par1)); - } - - /** - * Called when a lightning bolt hits the entity. - */ - public void onStruckByLightning(EntityLightningBolt par1EntityLightningBolt) - { - super.onStruckByLightning(par1EntityLightningBolt); - this.dataWatcher.updateObject(17, Byte.valueOf((byte)1)); - } -}