Fix #40

Euphillya · May 26, 2024 · 590856a · 590856a
1 parent 0afa61b
commit 590856a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/...n/java/fr/euphyllia/skyllia/listeners/bukkitevents/paper/PortalAlternativePaperEvent.java b/...n/java/fr/euphyllia/skyllia/listeners/bukkitevents/paper/PortalAlternativePaperEvent.java
@@ -1,7 +1,9 @@
 package fr.euphyllia.skyllia.listeners.bukkitevents.paper;
 
 import fr.euphyllia.skyllia.api.SkylliaAPI;
+import fr.euphyllia.skyllia.api.configuration.WorldConfig;
 import fr.euphyllia.skyllia.api.event.players.PlayerPrepareChangeWorldSkyblockEvent;
+import fr.euphyllia.skyllia.configuration.ConfigToml;
 import fr.euphyllia.skyllia.listeners.ListenersUtils;
 import io.papermc.paper.event.entity.EntityInsideBlockEvent;
 import org.apache.logging.log4j.LogManager;
@@ -29,15 +31,31 @@ public void onPlayerInsidePortal(final EntityInsideBlockEvent event) {
             Block block = event.getBlock();
             World world = block.getWorld();
             if (!SkylliaAPI.isWorldSkyblock(world)) return;
-            //event.setCancelled(true); Todo ? Je ne sais plus pourquoi il est là
+            event.setCancelled(true);
             Material blockType = block.getType();
             switch (blockType) {
                 case NETHER_PORTAL -> {
-                    ListenersUtils.callPlayerPrepareChangeWorldSkyblockEvent(player, PlayerPrepareChangeWorldSkyblockEvent.PortalType.NETHER, world.getName());
+                    for (WorldConfig worldConfig : ConfigToml.worldConfigs) {
+                        if (worldConfig.name().equalsIgnoreCase(world.getName())) {
+                            if (worldConfig.netherPortal().enabled()) {
+                                ListenersUtils.callPlayerPrepareChangeWorldSkyblockEvent(player, PlayerPrepareChangeWorldSkyblockEvent.PortalType.NETHER, world.getName());
+                            }
+                            break;
+                        }
+                    }
+                }
+                case END_PORTAL -> {
+                    for (WorldConfig worldConfig : ConfigToml.worldConfigs) {
+                        if (worldConfig.name().equalsIgnoreCase(world.getName())) {
+                            if (worldConfig.endPortal().enabled()) {
+                                ListenersUtils.callPlayerPrepareChangeWorldSkyblockEvent(player, PlayerPrepareChangeWorldSkyblockEvent.PortalType.END, world.getName());
+                            }
+                            break;
+                        }
+                    }
                 }
-                case END_PORTAL ->
-                        ListenersUtils.callPlayerPrepareChangeWorldSkyblockEvent(player, PlayerPrepareChangeWorldSkyblockEvent.PortalType.END, world.getName());
             }
+
         }
     }
-}
+}
diff --git a/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/player/TeleportEvent.java b/plugin/src/main/java/fr/euphyllia/skyllia/listeners/bukkitevents/player/TeleportEvent.java
@@ -25,23 +25,6 @@ public TeleportEvent(InterneAPI interneAPI) {
         this.api = interneAPI;
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onPlayerTeleportOnIsland(final PlayerTeleportEvent event) {
-        if (VersionUtils.IS_PAPER) return; // Use : EntityInsideBlockEvent
-        if (event.isCancelled()) {
-            return;
-        }
-        Location destination = event.getTo();
-        PlayerTeleportEvent.TeleportCause teleportCause = event.getCause();
-        if (teleportCause.equals(PlayerTeleportEvent.TeleportCause.END_PORTAL)) {
-            ListenersUtils.callPlayerPrepareChangeWorldSkyblockEvent(event.getPlayer(),
-                    PlayerPrepareChangeWorldSkyblockEvent.PortalType.END, destination.getWorld().getName());
-        } else if (teleportCause.equals(PlayerTeleportEvent.TeleportCause.NETHER_PORTAL)) {
-            ListenersUtils.callPlayerPrepareChangeWorldSkyblockEvent(event.getPlayer(),
-                    PlayerPrepareChangeWorldSkyblockEvent.PortalType.NETHER, destination.getWorld().getName());
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerUsePortal(final PlayerPortalEvent event) {
         if (event.isCancelled()) return;