Avoid announcing advancements when going to nether or end and back.

BentoBoxWorld · Feb 19, 2021 · f833978 · f833978
1 parent 7548c42
commit f833978
Showing 1 changed file with 8 additions and 2 deletions.
diff --git 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());
+        }
     }