From acef90335c64508eb45cba3ad8aa42885bace04b Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 12 Nov 2016 15:43:56 +0100 Subject: [PATCH] Changed/Fixed hologram appearing I didn't like the look of the performance saving, as the hologram would appear at a lower distance then it would disappear --- .../shopchest/listeners/HologramUpdateListener.java | 10 +--------- .../shopchest/listeners/ShopInteractListener.java | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/epiceric/shopchest/listeners/HologramUpdateListener.java b/src/main/java/de/epiceric/shopchest/listeners/HologramUpdateListener.java index 3fe9fc7..2b2eb81 100644 --- a/src/main/java/de/epiceric/shopchest/listeners/HologramUpdateListener.java +++ b/src/main/java/de/epiceric/shopchest/listeners/HologramUpdateListener.java @@ -21,17 +21,9 @@ public class HologramUpdateListener implements Listener { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onPlayerMove(PlayerMoveEvent e) { - - if (e.getFrom().getBlockX() == e.getTo().getBlockX() - && e.getFrom().getBlockZ() == e.getTo().getBlockZ() - && e.getFrom().getBlockY() == e.getTo().getBlockY()) { - return; - } - Player p = e.getPlayer(); Location playerLocation = p.getLocation(); - double hologramDistanceSquared = plugin.getShopChestConfig().maximal_distance; - hologramDistanceSquared *= hologramDistanceSquared; + double hologramDistanceSquared = Math.pow(plugin.getShopChestConfig().maximal_distance, 2); for (Shop shop : plugin.getShopUtils().getShops()) { Block b = shop.getLocation().getBlock(); diff --git a/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java b/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java index 3b91b7e..94786c1 100644 --- a/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java +++ b/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java @@ -296,12 +296,12 @@ public class ShopInteractListener implements Listener { executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_CREATED)); for (Player p : location.getWorld().getPlayers()) { - if (p.getLocation().distanceSquared(location) <= config.maximal_distance) { + if (p.getLocation().distanceSquared(location) <= Math.pow(config.maximal_distance, 2)) { if (shop.getHologram() != null) { shop.getHologram().showPlayer(p); } } - if (p.getLocation().distanceSquared(location) <= config.maximal_item_distance) { + if (p.getLocation().distanceSquared(location) <= Math.pow(config.maximal_item_distance, 2)) { if (shop.getItem() != null) { shop.getItem().setVisible(p, true); }