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

Changes to FakeEntityTile

Browse source
This commit is contained in:
Robert Seifert 2013-06-09 21:57:34 -04:00
parent 41c1032226
commit edfa4739e8
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/minecraft/dark/library/damage/EntityTileDamage.java
View file

@ -1,6 +1,5 @@
package dark.library.damage;
import universalelectricity.core.vector.Vector3;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
@ -13,6 +12,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import universalelectricity.core.vector.Vector3;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput;
@ -81,10 +81,31 @@ public class EntityTileDamage extends EntityLiving implements IEntityAdditionalS
@Override
public boolean isPotionApplicable(PotionEffect par1PotionEffect)
{
// TODO change this later to pass this question to the tile
if (par1PotionEffect != null && this.host instanceof IHpTile)
{
return ((IHpTile) this.host).canApplyPotion(par1PotionEffect);
}
return false;
}
@Override
public void addPotionEffect(PotionEffect par1PotionEffect)
{
if (this.isPotionApplicable(par1PotionEffect))
{
if (this.activePotionsMap.containsKey(Integer.valueOf(par1PotionEffect.getPotionID())))
{
((PotionEffect) this.activePotionsMap.get(Integer.valueOf(par1PotionEffect.getPotionID()))).combine(par1PotionEffect);
this.onChangedPotionEffect((PotionEffect) this.activePotionsMap.get(Integer.valueOf(par1PotionEffect.getPotionID())));
}
else
{
this.activePotionsMap.put(Integer.valueOf(par1PotionEffect.getPotionID()), par1PotionEffect);
this.onNewPotionEffect(par1PotionEffect);
}
}
}
@Override
public String getEntityName()
{
@ -123,6 +144,7 @@ public class EntityTileDamage extends EntityLiving implements IEntityAdditionalS
}
else
{
this.updatePotionEffects();
this.setPosition(this.host.xCoord + 0.5, this.host.yCoord, this.host.zCoord + 0.5);
}
}

6
src/minecraft/dark/library/damage/IHpTile.java
View file

@ -1,5 +1,6 @@
package dark.library.damage;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
public interface IHpTile
@ -36,4 +37,9 @@ public interface IHpTile
* Max hp of the object
*/
public int getMaxHealth();
/**
* Can the potion be used on the Entity that is translating damage for the TileEntity
*/
public boolean canApplyPotion(PotionEffect par1PotionEffect);
}