Prevent stomping on other metadata - incompatibility with Border

BentoBoxWorld · Jan 1, 2025 · 7984795 · 7984795
1 parent 13d7db9
commit 7984795
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/main/java/world/bentobox/islandfly/listeners/FlyListener.java b/src/main/java/world/bentobox/islandfly/listeners/FlyListener.java
@@ -1,8 +1,5 @@
 package world.bentobox.islandfly.listeners;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -12,6 +9,7 @@
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 import org.eclipse.jdt.annotation.NonNull;
 
+import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.events.island.IslandEnterEvent;
 import world.bentobox.bentobox.api.events.island.IslandExitEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -42,16 +40,14 @@ public FlyListener(final IslandFlyAddon islandFlyAddon) {
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onToggleFlight(final PlayerToggleFlightEvent event) {
+        BentoBox.getInstance().logDebug(event.getEventName());
         final User user = User.getInstance(event.getPlayer());
         if (checkUser(user)) {
             user.sendMessage("islandfly.not-allowed");
         } else {
             addon.getIslands().getIslandAt(user.getLocation())
-                    .filter(i -> i.getMemberSet().contains(user.getUniqueId())).ifPresent(is -> {
-                        Map<String, MetaDataValue> metaData = new HashMap<>();
-                        metaData.put("IslandFly-" + is.getUniqueId(), new MetaDataValue(event.isFlying()));
-                        user.setMetaData(metaData); // Record the fly state for this island
-                    });
+                    .filter(i -> i.getMemberSet().contains(user.getUniqueId())).ifPresent(
+                            is -> user.putMetaData(ISLANDFLY + is.getUniqueId(), new MetaDataValue(event.isFlying())));
 
         }
     }