From 14d5264b332038096ee77ba452b8358b06f40aef Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Fri, 14 Jun 2013 05:20:51 -0400 Subject: [PATCH 1/2] limbo exit crap fix --- StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java index 2309e8ea..26689253 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java @@ -118,7 +118,7 @@ public class BlockDimWallPerm extends Block { - + EntityPlayer.class.cast(par5Entity).setPositionAndUpdate( x, y, z ); } From 44a413f6fb62e00a884918fe3d7318c621b0082c Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Fri, 14 Jun 2013 15:21:38 -0400 Subject: [PATCH 2/2] Fixed monlith sound and spawn --- .../mod_pocketDim/ticking/MobObelisk.java | 51 +++++++------------ 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index d2a09c90..463ee5b0 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -131,7 +131,7 @@ public class MobObelisk extends EntityFlying implements IMob - EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 35); + EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 30); if(entityPlayer != null) { @@ -170,15 +170,16 @@ public class MobObelisk extends EntityFlying implements IMob } } - if(aggro>430) + if(aggro>430&&this.soundTime<100) { this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",2, 1); + this.soundTime=100; } - if(aggro>445) + if(aggro>445&&this.soundTime<200) { this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",5, 1); - + this.soundTime=200; } @@ -249,32 +250,7 @@ public class MobObelisk extends EntityFlying implements IMob soundTime--; } - if(this.prevPosX==this.posX||this.prevPosY==this.posY||this.prevPosZ==this.posZ) - { - do - { - destX= rand.nextInt(40)-20; - destY= rand.nextInt(40)-20; - destZ= rand.nextInt(40)-20; - - - } - while(!this.isCourseTraversable(destX, destY, destZ, 1)); - } - - - if(Math.abs(this.posX)-Math.abs(this.destX)+Math.abs(this.posY)-Math.abs(this.destY)+Math.abs(this.posZ)-Math.abs(this.destZ)<5) - { - do - { - destX= rand.nextInt(40)-20; - destY= rand.nextInt(40)-20; - destZ= rand.nextInt(40)-20; - - - } - while(!this.isCourseTraversable(destX, destY, destZ, 1)); - } + { @@ -401,13 +377,20 @@ public class MobObelisk extends EntityFlying implements IMob { List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this,AxisAlignedBB.getBoundingBox( this.posX-15, posY-4, this.posZ-15, this.posX+15, this.posY+15, this.posZ+15)); - if(list.size()>0&&this.worldObj.provider.dimensionId==DDProperties.instance().LimboDimensionID) + if(this.worldObj.provider.dimensionId==DDProperties.instance().LimboDimensionID) { - return false; + if(list.size()>0) + { + return false; + } + } - else if(list.size()>5&&this.worldObj.provider instanceof pocketProvider) + else if(this.worldObj.provider instanceof pocketProvider) { - return false; + if(list.size()>5||this.worldObj.canBlockSeeTheSky((int)this.posX, (int)this.posY, (int)this.posZ)) + { + return false; + } } return this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox); }