diff --git a/StevenDimDoors/mod_pocketDim/DungeonGenerator.java b/StevenDimDoors/mod_pocketDim/DungeonGenerator.java index 3ba08dc..7301860 100644 --- a/StevenDimDoors/mod_pocketDim/DungeonGenerator.java +++ b/StevenDimDoors/mod_pocketDim/DungeonGenerator.java @@ -1,5 +1,6 @@ package StevenDimDoors.mod_pocketDim; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Random; @@ -8,7 +9,7 @@ import net.minecraft.world.World; -public class DungeonGenerator +public class DungeonGenerator implements Serializable { public int weight; diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index a520e6f..0be3738 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -583,7 +583,7 @@ public class mod_pocketDim this.complexHalls.add(new DungeonGenerator(0, "brokenPillarsO.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "buggyTopEntry1.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "exitRuinsWithHiddenDoor.schematic", true)); - this.complexHalls.add(new DungeonGenerator(0, "hallwayHiddenTreasure.schematic", true)); + this.complexHalls.add(new DungeonGenerator(0, "hallwayHiddenTreasure.schematic", false)); this.complexHalls.add(new DungeonGenerator(0, "mediumPillarStairs.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "ruinsO.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "pitStairs.schematic", true)); diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index 3533003..870586c 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -120,7 +120,7 @@ public class MobObelisk extends EntityFlying implements IMob - EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 30); + EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 35); if(entityPlayer != null) { @@ -141,13 +141,13 @@ public class MobObelisk extends EntityFlying implements IMob } if(aggro<470) { - if(rand.nextInt(11)>this.textureState) + if(rand.nextInt(11)>this.textureState||this.aggro>=300||rand.nextInt(13)>this.textureState) { aggro++; } - if(this.worldObj.provider instanceof pocketProvider) + if(this.worldObj.provider instanceof pocketProvider||this.worldObj.getClosestPlayerToEntity(this, 5)!=null) { aggro++; @@ -185,14 +185,18 @@ public class MobObelisk extends EntityFlying implements IMob dimHelper.instance.teleportToPocket(worldObj, link, entityPlayer); entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.wylkermaxcrack",13, 1); + if(!(this.worldObj.provider instanceof LimboProvider ||this.worldObj.provider instanceof pocketProvider)) + { + this.setDead(); + } } - if(!(this.worldObj.provider instanceof LimboProvider)) + if(!(this.worldObj.provider instanceof LimboProvider || this.worldObj.getClosestPlayerToEntity(this, 5)!=null)||this.aggro>300) { - for (int i = 0; i < -1+this.textureState/3; ++i) + for (int i = 0; i < -1+this.textureState/2; ++i) { entityPlayer.worldObj.spawnParticle("portal", entityPlayer.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, entityPlayer.posY + this.rand.nextDouble() * (double)entityPlayer.height - 0.75D, entityPlayer.posZ + (this.rand.nextDouble() - 0.5D) * (double)entityPlayer.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D); } @@ -321,7 +325,11 @@ public class MobObelisk extends EntityFlying implements IMob } public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) { - return false; + if(!(par1DamageSource==DamageSource.inWall)) + { + this.aggro=400; + } + return false; } public void faceEntity(Entity par1Entity, float par2, float par3) { diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png index e11d7cd..e71f830 100644 Binary files a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png and b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png differ diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.psd b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.psd index 2322556..2655338 100644 Binary files a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.psd and b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.psd differ diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png index e11d7cd..e71f830 100644 Binary files a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png and b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png differ