Monoliths have no collision, now

This commit is contained in:
StevenRS11
2014-01-21 04:15:48 -05:00
parent 26c8581857
commit 5d80170b52

View File

@@ -42,7 +42,6 @@ public class MobMonolith extends EntityFlying implements IMob
this.noClip=true; this.noClip=true;
this.scaleFactor = (float) ((rand.nextDouble()/2)+1); this.scaleFactor = (float) ((rand.nextDouble()/2)+1);
this.aggroMax = rand.nextInt(245)+200; this.aggroMax = rand.nextInt(245)+200;
if (properties == null) if (properties == null)
properties = DDProperties.instance(); properties = DDProperties.instance();
} }
@@ -58,6 +57,17 @@ public class MobMonolith extends EntityFlying implements IMob
{ {
return false; return false;
} }
@Override
public AxisAlignedBB getBoundingBox()
{
return null;
}
@Override
public AxisAlignedBB getCollisionBox(Entity par1Entity)
{
return null;
}
@Override @Override
public boolean canDespawn() public boolean canDespawn()
@@ -69,7 +79,7 @@ public class MobMonolith extends EntityFlying implements IMob
protected void applyEntityAttributes() protected void applyEntityAttributes()
{ {
super.applyEntityAttributes(); super.applyEntityAttributes();
this.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth).setAttribute(20); this.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth).setAttribute(0);
} }
public boolean canBePushed() public boolean canBePushed()
@@ -145,7 +155,7 @@ public class MobMonolith extends EntityFlying implements IMob
this.moveEntity(0, .1, 0); this.moveEntity(0, .1, 0);
} }
EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 60); EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 35);
if (entityPlayer != null) if (entityPlayer != null)
{ {
@@ -164,6 +174,8 @@ public class MobMonolith extends EntityFlying implements IMob
if (rand.nextInt(11)>this.textureState||this.aggro>=300||rand.nextInt(13)>this.textureState&&this.aggroMax>this.aggro) if (rand.nextInt(11)>this.textureState||this.aggro>=300||rand.nextInt(13)>this.textureState&&this.aggroMax>this.aggro)
{ {
aggro++; aggro++;
aggro++;
} }
if (this.worldObj.provider instanceof PocketProvider||this.worldObj.getClosestPlayerToEntity(this, 5)!=null) if (this.worldObj.provider instanceof PocketProvider||this.worldObj.getClosestPlayerToEntity(this, 5)!=null)
{ {
@@ -198,7 +210,7 @@ public class MobMonolith extends EntityFlying implements IMob
} }
} }
} }
else else if(this.worldObj.provider instanceof PocketProvider)
{ {
if(aggro<this.aggroMax/2) if(aggro<this.aggroMax/2)
{ {