From f8339788d77cbb326049ca7e7c7d9529d0c75ceb Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 18 Feb 2021 21:52:00 -0800 Subject: [PATCH] Avoid announcing advancements when going to nether or end and back. --- .../invswitcher/listeners/PlayerListener.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/wasteofplastic/invswitcher/listeners/PlayerListener.java b/src/main/java/com/wasteofplastic/invswitcher/listeners/PlayerListener.java index b22fdfe..91ea9b6 100644 --- a/src/main/java/com/wasteofplastic/invswitcher/listeners/PlayerListener.java +++ b/src/main/java/com/wasteofplastic/invswitcher/listeners/PlayerListener.java @@ -9,6 +9,8 @@ import com.wasteofplastic.invswitcher.InvSwitcher; +import world.bentobox.bentobox.util.Util; + /** * Handles all teleportation events, e.g., player teleporting into world * @@ -32,7 +34,9 @@ public PlayerListener(InvSwitcher addon) { */ @EventHandler(priority = EventPriority.HIGH, ignoreCancelled=true) public void onWorldEnter(final PlayerChangedWorldEvent event) { - addon.getStore().getInventory(event.getPlayer(), event.getPlayer().getWorld()); + if (!Util.sameWorld(event.getPlayer().getWorld(), event.getFrom())) { + addon.getStore().getInventory(event.getPlayer(), event.getPlayer().getWorld()); + } } /** @@ -41,7 +45,9 @@ public void onWorldEnter(final PlayerChangedWorldEvent event) { */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled=true) public void onWorldExit(final PlayerChangedWorldEvent event) { - addon.getStore().storeInventory(event.getPlayer(), event.getFrom()); + if (!Util.sameWorld(event.getPlayer().getWorld(), event.getFrom())) { + addon.getStore().storeInventory(event.getPlayer(), event.getFrom()); + } }