diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 85ccafe..5fd583f 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -98,14 +98,14 @@ public class EventHookContainer { player.inventory.clearInventory(-1, -1); } - + player.extinguish(); + player.clearActivePotions(); ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand); Point4D destination = new Point4D((int) (coords.posX+entity.posX), coords.posY, (int) (coords.posZ+entity.posZ ), mod_pocketDim.properties.LimboDimensionID); DDTeleporter.teleportEntity(player, destination, false); player.setHealth(player.getMaxHealth()); - player.extinguish(); - player.clearActivePotions(); event.setCanceled(true); + return false; } return true; diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java index 8049533..ed0abd7 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java @@ -72,22 +72,11 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn shouldOpen = false; if (!world.isRemote && world.getBlockId(x, y-1, z) == this.blockID) { - int var12 = MathHelper.floor_double((player.rotationYaw+90) * 4.0F / 360.0F + 0.5D) & 3; - - if (world.getBlockMetadata(x, y-1, z) == var12) - { - var12 = BlockRotator.transformMetadata(var12, 1, this.blockID); - } - world.setBlockMetadataWithNotify(x, y-1, z, var12, 2); + world.setBlockMetadataWithNotify(x, y-1, z, (world.getBlockMetadata(x, y-1, z)+1)%4, 2); } if (!world.isRemote && world.getBlockId(x, y+1, z) == this.blockID) { - int var12 = MathHelper.floor_double((player.rotationYaw+90) * 4.0F / 360.0F + 0.5D) & 3; - if(world.getBlockMetadata(x, y, z)==var12) - { - var12 = BlockRotator.transformMetadata(var12, 1, this.blockID); - } - world.setBlockMetadataWithNotify(x, y, z, var12, 2); + world.setBlockMetadataWithNotify(x, y, z, (world.getBlockMetadata(x, y, z)+1)%4, 2); } world.playAuxSFXAtEntity(player, 1001, x, y, z, 0); diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 79e0779..e772dda 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -290,11 +290,13 @@ public class mod_pocketDim DungeonHelper.initialize(); this.riftGen.initGateways(); + /** coriumFluid = new LiquidCorium("Corium").setDensity(1000).setTemperature(3473).setDensity(9400).setLuminosity(6).setRarity(EnumRarity.rare); coriumBlock = new LiquidCoriumBlock(properties.CoriumBlockID, coriumFluid, Material.lava).setQuantaPerBlock(16).setTickRate(20).setTickRandomly(true).setUnlocalizedName("Corium"); FluidRegistry.registerFluid(coriumFluid); GameRegistry.registerBlock(coriumBlock,"Corium"); LanguageRegistry.addName(coriumBlock, "Corium"); + **/ // Register loot chests DDLoot.registerInfo(properties);