diff --git a/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java b/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java
index 1dbe09a..b5fd322 100644
--- a/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java
+++ b/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java
@@ -27,6 +27,7 @@ public class BukkitAdapter implements BukkitInterface {
     public static final int BUKKIT_V1_15 = 15;
     public static final int BUKKIT_V1_16 = 16;
     public static final int BUKKIT_V1_17 = 17;
+    public static final int BUKKIT_V1_18 = 18;
 
     public static void loadAdapter() {
         switch (ConfigHandler.SERVER_VERSION) {
@@ -41,6 +42,7 @@ public class BukkitAdapter implements BukkitInterface {
                 BukkitAdapter.ADAPTER = new Bukkit_v1_16();
                 break;
             case BUKKIT_V1_17:
+            case BUKKIT_V1_18:
             default:
                 BukkitAdapter.ADAPTER = new Bukkit_v1_17();
                 break;
diff --git a/src/main/java/net/coreprotect/paper/PaperAdapter.java b/src/main/java/net/coreprotect/paper/PaperAdapter.java
index f55db21..0e35d21 100644
--- a/src/main/java/net/coreprotect/paper/PaperAdapter.java
+++ b/src/main/java/net/coreprotect/paper/PaperAdapter.java
@@ -15,6 +15,7 @@ public class PaperAdapter implements PaperInterface {
     public static final int PAPER_V1_15 = BukkitAdapter.BUKKIT_V1_15;
     public static final int PAPER_V1_16 = BukkitAdapter.BUKKIT_V1_16;
     public static final int PAPER_V1_17 = BukkitAdapter.BUKKIT_V1_17;
+    public static final int PAPER_V1_18 = BukkitAdapter.BUKKIT_V1_18;
 
     public static void loadAdapter() {
         int paperVersion = ConfigHandler.SERVER_VERSION;
@@ -33,6 +34,7 @@ public class PaperAdapter implements PaperInterface {
                 break;
             case PAPER_V1_16:
             case PAPER_V1_17:
+            case PAPER_V1_18:
             default:
                 PaperAdapter.ADAPTER = new Paper_v1_16();
                 break;
diff --git a/src/main/java/net/coreprotect/spigot/SpigotAdapter.java b/src/main/java/net/coreprotect/spigot/SpigotAdapter.java
index d47c13c..5963730 100644
--- a/src/main/java/net/coreprotect/spigot/SpigotAdapter.java
+++ b/src/main/java/net/coreprotect/spigot/SpigotAdapter.java
@@ -18,6 +18,7 @@ public class SpigotAdapter implements SpigotInterface {
     public static final int SPIGOT_V1_15 = BukkitAdapter.BUKKIT_V1_15;
     public static final int SPIGOT_V1_16 = BukkitAdapter.BUKKIT_V1_16;
     public static final int SPIGOT_V1_17 = BukkitAdapter.BUKKIT_V1_17;
+    public static final int SPIGOT_V1_18 = BukkitAdapter.BUKKIT_V1_18;
 
     public static void loadAdapter() {
         int spigotVersion = ConfigHandler.SERVER_VERSION;
@@ -36,6 +37,7 @@ public class SpigotAdapter implements SpigotInterface {
                 break;
             case SPIGOT_V1_16:
             case SPIGOT_V1_17:
+            case SPIGOT_V1_18:
             default:
                 SpigotAdapter.ADAPTER = new Spigot_v1_16();
                 break;