From 6574951833da2898ae41b86f20477551d2ffc97c Mon Sep 17 00:00:00 2001
From: Daniel V <daniel.viddy@gmail.com>
Date: Fri, 1 Mar 2024 14:35:08 -0500
Subject: [PATCH] Final compatibility patches for hardcore mode on worlds.

---
 pom.xml                                                     | 6 ++++++
 .../phantomworlds/comatibility/VersionCompatibility.java    | 1 +
 .../commands/params/PotionEffectParameter.java              | 2 --
 .../lokka30/phantomworlds/commands/sub/SetSpawnCommand.java | 2 +-
 .../listeners/player/PlayerChangeWorldListener.java         | 3 +--
 .../listeners/player/PlayerTeleportListener.java            | 2 +-
 .../java/me/lokka30/phantomworlds/world/PhantomWorld.java   | 2 --
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ccd486..1698a5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,12 @@
             <version>1.20.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <!-- <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>-->
         <dependency>
             <groupId>com.github.lokka30</groupId>
             <artifactId>MicroLib</artifactId>
diff --git a/src/main/java/me/lokka30/phantomworlds/comatibility/VersionCompatibility.java b/src/main/java/me/lokka30/phantomworlds/comatibility/VersionCompatibility.java
index 8fb0346..7dbe005 100644
--- a/src/main/java/me/lokka30/phantomworlds/comatibility/VersionCompatibility.java
+++ b/src/main/java/me/lokka30/phantomworlds/comatibility/VersionCompatibility.java
@@ -19,6 +19,7 @@
 
 import org.bukkit.NamespacedKey;
 import org.bukkit.World;
+import org.bukkit.WorldCreator;
 import org.bukkit.potion.PotionEffectType;
 
 import java.util.ArrayList;
diff --git a/src/main/java/me/lokka30/phantomworlds/commands/params/PotionEffectParameter.java b/src/main/java/me/lokka30/phantomworlds/commands/params/PotionEffectParameter.java
index b1dd3e8..9757230 100644
--- a/src/main/java/me/lokka30/phantomworlds/commands/params/PotionEffectParameter.java
+++ b/src/main/java/me/lokka30/phantomworlds/commands/params/PotionEffectParameter.java
@@ -42,8 +42,6 @@ public class PotionEffectParameter extends ArgumentResolver<CommandSender, Strin
 
   static {
 
-    System.out.println("Null Check: " + (PhantomWorlds.compatibility() == null));
-
     POTION_EFFECTS.addAll(PhantomWorlds.compatibility().potionEffectSuggestions());
   }
 
diff --git a/src/main/java/me/lokka30/phantomworlds/commands/sub/SetSpawnCommand.java b/src/main/java/me/lokka30/phantomworlds/commands/sub/SetSpawnCommand.java
index af9789a..d74d978 100644
--- a/src/main/java/me/lokka30/phantomworlds/commands/sub/SetSpawnCommand.java
+++ b/src/main/java/me/lokka30/phantomworlds/commands/sub/SetSpawnCommand.java
@@ -88,7 +88,7 @@ public static void onCommand(final CommandSender sender, Double x, Double y, Dou
       //PhantomWorlds doesn't manage the spawn here so let Mojang deal with it.
       try {
         finalWorld.setSpawnLocation(new Location(finalWorld, finalX, finalY, finalZ, finalYaw, finalPitch));
-      } catch(NoSuchMethodError err) {
+      } catch(NoSuchMethodError ignore) {
         //This is dumb that the setSpawn method in spigot uses integers... great design.
         finalWorld.setSpawnLocation((int)finalX, (int)finalY, (int)finalZ);
         // 1.8 doesn't let us set pitch and yaw ... yawn
diff --git a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerChangeWorldListener.java b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerChangeWorldListener.java
index f7bbbda..dda6e2a 100644
--- a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerChangeWorldListener.java
+++ b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerChangeWorldListener.java
@@ -20,7 +20,6 @@
 import me.lokka30.phantomworlds.PhantomWorlds;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.NamespacedKey;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
@@ -67,7 +66,7 @@ public void onChangeWorld(PlayerChangedWorldEvent event) {
             PhantomWorlds.instance().data.getConfig().isConfigurationSection(cfgPrevPath + ".effects")) {
       for(final String effName : PhantomWorlds.instance().data.getConfig().getConfigurationSection(cfgPrevPath + ".effects").getKeys(false)) {
 
-        final PotionEffectType type = PotionEffectType.getByKey(NamespacedKey.fromString(effName));
+        final PotionEffectType type = PhantomWorlds.compatibility().findType(effName);
         if(type != null) {
           event.getPlayer().removePotionEffect(type);
         }
diff --git a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerTeleportListener.java b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerTeleportListener.java
index e6d33ae..e449913 100644
--- a/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerTeleportListener.java
+++ b/src/main/java/me/lokka30/phantomworlds/listeners/player/PlayerTeleportListener.java
@@ -40,7 +40,7 @@ public PlayerTeleportListener(PhantomWorlds plugin) {
   }
 
   @EventHandler
-  public void onPortal(PlayerTeleportEvent event) {
+  public void onTP(PlayerTeleportEvent event) {
     if(event.getTo() == null || event.getTo().getWorld() == null || event.getFrom().getWorld() == null) {
       return;
     }
diff --git a/src/main/java/me/lokka30/phantomworlds/world/PhantomWorld.java b/src/main/java/me/lokka30/phantomworlds/world/PhantomWorld.java
index eb1b85b..6e3bb20 100644
--- a/src/main/java/me/lokka30/phantomworlds/world/PhantomWorld.java
+++ b/src/main/java/me/lokka30/phantomworlds/world/PhantomWorld.java
@@ -121,8 +121,6 @@ public void create() {
     world.setKeepSpawnInMemory(keepSpawnInMemory);
     world.setPVP(allowPvP);
     world.setDifficulty(difficulty);
-
-    PhantomWorlds.compatibility().applyHardcore(world, hardcore);
   }
 
   public void save() {