From bac3caa5ccb8bf1fb7dda76b500296512b5742fb Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Fri, 6 Sep 2013 22:14:27 -0400 Subject: [PATCH] Minor Changes Changed EventHookContainer.LivingDeathEvent() to use the player's max health instead of a fixed health value. No magic numbers! Also cleaned up the code a little. --- .../mod_pocketDim/EventHookContainer.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 9915963..132a161 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -1,7 +1,6 @@ package StevenDimDoors.mod_pocketDim; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChunkCoordinates; import net.minecraftforge.client.event.sound.SoundLoadEvent; @@ -70,15 +69,17 @@ public class EventHookContainer public boolean LivingDeathEvent(LivingDeathEvent event) { Entity entity = event.entity; - if(entity instanceof EntityPlayer&&entity.worldObj.provider instanceof PocketProvider && this.properties.LimboEnabled) + if (entity instanceof EntityPlayer && entity.worldObj.provider instanceof PocketProvider + && properties.LimboEnabled) { - if(!this.properties.LimboReturnsInventoryEnabled) + EntityPlayer player = (EntityPlayer) entity; + if (!properties.LimboReturnsInventoryEnabled) { - ((EntityPlayer)entity).inventory.clearInventory(-1, -1); + player.inventory.clearInventory(-1, -1); } - ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(entity.worldObj.rand); - DDTeleporter.teleportEntity(entity, new Point4D(coords.posX,coords.posY,coords.posZ,mod_pocketDim.properties.LimboDimensionID)); - ((EntityLiving) entity).setEntityHealth(20); + ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand); + DDTeleporter.teleportEntity(player, new Point4D(coords.posX, coords.posY, coords.posZ, mod_pocketDim.properties.LimboDimensionID)); + player.setEntityHealth(player.getMaxHealth()); event.setCanceled(true); return false; }