From 70495220eb0437f3389c0f0a13e6540b7ae0beca Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Mon, 15 Nov 2021 17:18:00 +0100 Subject: [PATCH] Simplifies some function calls --- .../knarcraft/stargate/portal/teleporter/Teleporter.java | 6 +++--- .../net/knarcraft/stargate/utility/PortalFileHelper.java | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java b/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java index 8cc3e6f..06befad 100644 --- a/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java +++ b/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java @@ -191,9 +191,9 @@ public abstract class Teleporter { */ private Location adjustExitLocation(Location traveller, Location exitLocation) { if (exitLocation != null) { - BlockData blockData = portal.getWorld().getBlockAt(exitLocation).getBlockData(); - if ((blockData instanceof Bisected && ((Bisected) blockData).getHalf() == Bisected.Half.BOTTOM) || - (blockData instanceof Slab) && ((Slab) blockData).getType() == Slab.Type.BOTTOM) { + BlockData blockData = exitLocation.getBlock().getBlockData(); + if ((blockData instanceof Bisected bisected && bisected.getHalf() == Bisected.Half.BOTTOM) || + (blockData instanceof Slab slab && slab.getType() == Slab.Type.BOTTOM)) { //Prevent traveller from spawning inside a slab Stargate.debug("adjustExitLocation", "Added a block to get above a slab"); exitLocation.add(0, 1, 0); diff --git a/src/main/java/net/knarcraft/stargate/utility/PortalFileHelper.java b/src/main/java/net/knarcraft/stargate/utility/PortalFileHelper.java index b2678a7..74741fc 100644 --- a/src/main/java/net/knarcraft/stargate/utility/PortalFileHelper.java +++ b/src/main/java/net/knarcraft/stargate/utility/PortalFileHelper.java @@ -292,16 +292,15 @@ public final class PortalFileHelper { */ private static void updatePortalButton(Portal portal) { BlockLocation buttonLocation = getButtonLocation(portal); - BlockData buttonData = buttonLocation.getBlock().getBlockData(); if (portal.getOptions().isAlwaysOn()) { //Clear button if not already air or water - if (MaterialHelper.isButtonCompatible(buttonData.getMaterial())) { + if (MaterialHelper.isButtonCompatible(buttonLocation.getType())) { Material newMaterial = decideRemovalMaterial(buttonLocation, portal); Stargate.addBlockChangeRequest(new BlockChangeRequest(buttonLocation, newMaterial, null)); } } else { //Replace button if the material does not match - if (buttonData.getMaterial() != portal.getGate().getPortalButton()) { + if (buttonLocation.getType() != portal.getGate().getPortalButton()) { generatePortalButton(portal, DirectionHelper.getBlockFaceFromYaw(portal.getYaw())); } }