From 05674846dd98d204893f0575b13d99a9a05ed5c1 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Fri, 15 Jan 2016 19:11:04 +0100 Subject: [PATCH] Fixed server-crashing bug (nuclear creeper transformation) --- com/hbm/blocks/BlockOre.java | 6 +++--- com/hbm/blocks/ModBlocks.java | 4 ++-- com/hbm/blocks/TileEntityYellowBarrel.java | 2 +- com/hbm/blocks/WasteEarth.java | 2 +- com/hbm/entity/EntityNuclearCreeper.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/com/hbm/blocks/BlockOre.java b/com/hbm/blocks/BlockOre.java index 9ebfcdbd0..0dea88ca4 100644 --- a/com/hbm/blocks/BlockOre.java +++ b/com/hbm/blocks/BlockOre.java @@ -105,7 +105,7 @@ public class BlockOre extends Block { } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); + //creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); entity.setDead(); if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); @@ -126,7 +126,7 @@ public class BlockOre extends Block { } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); + //creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); if(!entity.isDead) if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); @@ -149,7 +149,7 @@ public class BlockOre extends Block { } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); + //creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); if(!entity.isDead) if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index f38d0e3c1..bff95b634 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -266,8 +266,8 @@ public class ModBlocks { steel_scaffold = new DecoBlock(Material.rock).setBlockName("steel_scaffold").setCreativeTab(MainRegistry.tabBlock).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_scaffold"); mush = new BlockMush(Material.plants).setBlockName("mush").setCreativeTab(MainRegistry.tabBlock).setLightLevel(0.5F).setStepSound(Block.soundTypeGrass).setBlockTextureName(RefStrings.MODID + ":mush"); - mush_block = new BlockMushHuge(Material.plants).setBlockName("mush_block").setCreativeTab(MainRegistry.tabBlock).setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_skin"); - mush_block_stem = new BlockMushHuge(Material.plants).setBlockName("mush_block_stem").setCreativeTab(MainRegistry.tabBlock).setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_stem"); + mush_block = new BlockMushHuge(Material.plants).setBlockName("mush_block").setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_skin"); + mush_block_stem = new BlockMushHuge(Material.plants).setBlockName("mush_block_stem").setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_stem"); waste_earth = new WasteEarth(Material.ground).setBlockName("waste_earth").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.tabBlock).setHardness(0.5F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":waste_earth"); waste_mycelium = new WasteEarth(Material.ground).setBlockName("waste_mycelium").setStepSound(Block.soundTypeGrass).setLightLevel(1F).setCreativeTab(MainRegistry.tabBlock).setHardness(0.5F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":waste_mycelium_side"); diff --git a/com/hbm/blocks/TileEntityYellowBarrel.java b/com/hbm/blocks/TileEntityYellowBarrel.java index 4344bec4d..15141a688 100644 --- a/com/hbm/blocks/TileEntityYellowBarrel.java +++ b/com/hbm/blocks/TileEntityYellowBarrel.java @@ -67,7 +67,7 @@ public class TileEntityYellowBarrel extends TileEntity { } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(this.worldObj); creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); + //creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); if(!entity.isDead) if(!worldObj.isRemote) worldObj.spawnEntityInWorld(creep); diff --git a/com/hbm/blocks/WasteEarth.java b/com/hbm/blocks/WasteEarth.java index 1a594dda6..ee88381be 100644 --- a/com/hbm/blocks/WasteEarth.java +++ b/com/hbm/blocks/WasteEarth.java @@ -86,7 +86,7 @@ public class WasteEarth extends Block { } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); + //creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); if(!entity.isDead) if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); diff --git a/com/hbm/entity/EntityNuclearCreeper.java b/com/hbm/entity/EntityNuclearCreeper.java index 5afa05cbf..2813abeaf 100644 --- a/com/hbm/entity/EntityNuclearCreeper.java +++ b/com/hbm/entity/EntityNuclearCreeper.java @@ -239,7 +239,7 @@ public class EntityNuclearCreeper extends EntityMob { } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(this.worldObj); creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); + //creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); if(!entity.isDead) if(!worldObj.isRemote) worldObj.spawnEntityInWorld(creep);