diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/everglades/block')
| -rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java index e3ee1b91df..b4943d1886 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java @@ -11,8 +11,6 @@ public class BlockDarkWorldSludgeFluid extends Fluid { protected static int mapColor = 0xFFFFFFFF; protected static float overlayAlpha = 0.2F; - // protected static SoundEvent emptySound = SoundEvents.ITEM_BUCKET_EMPTY; - // protected static SoundEvent fillSound = SoundEvents.ITEM_BUCKET_FILL; protected static Material material = SLUDGE; public BlockDarkWorldSludgeFluid(String fluidName, int rgbColour) { @@ -23,7 +21,7 @@ public class BlockDarkWorldSludgeFluid extends Fluid { super(fluidName); setColor(rgbColour); if (overlayAlpha != null) { - setAlpha(overlayAlpha.floatValue()); + setAlpha(overlayAlpha); } else { setAlpha(0); } diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index 7b7dde778e..791c4321a2 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -285,8 +285,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { if ((par5Entity.ridingEntity == null) && (par5Entity.riddenByEntity == null) - && ((par5Entity instanceof EntityPlayerMP))) { - EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; + && ((par5Entity instanceof EntityPlayerMP thePlayer))) { if (thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 100; } else if (thePlayer.dimension != Dimension_Everglades.DIMID) { |