diff --git a/pom.xml b/pom.xml
index 4fe4fa5..2ba7f4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,13 +39,18 @@
             <id>spigot</id>
             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
+
+        <repository>
+            <id>maven-central</id>
+            <url>https://repo1.maven.org/maven2/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12-pre5-SNAPSHOT</version>
+            <version>1.14.4-R0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -63,6 +68,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetCommandEvent.java b/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetCommandEvent.java
index 53fbe95..c76f91b 100644
--- a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetCommandEvent.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetCommandEvent.java
@@ -1,10 +1,12 @@
 package me.totalfreedom.bukkittelnet.api;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-public class TelnetCommandEvent extends TelnetEvent implements Cancellable
+public class TelnetCommandEvent extends Event implements Cancellable
 {
 
     private static final HandlerList handlers = new HandlerList();
@@ -15,6 +17,7 @@ public class TelnetCommandEvent extends TelnetEvent implements Cancellable
 
     public TelnetCommandEvent(CommandSender sender, String command)
     {
+        super(!Bukkit.getServer().isPrimaryThread());
         this.cancelled = false;
         this.sender = sender;
         this.command = command;
diff --git a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetEvent.java b/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetEvent.java
deleted file mode 100644
index e124f6a..0000000
--- a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetEvent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package me.totalfreedom.bukkittelnet.api;
-
-import org.bukkit.event.server.ServerEvent;
-
-public abstract class TelnetEvent extends ServerEvent
-{
-
-}
diff --git a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetPreLoginEvent.java b/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetPreLoginEvent.java
index ef46c8b..1f4f2f9 100644
--- a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetPreLoginEvent.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetPreLoginEvent.java
@@ -2,8 +2,10 @@ package me.totalfreedom.bukkittelnet.api;
 
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
 
-public class TelnetPreLoginEvent extends TelnetEvent implements Cancellable
+public class TelnetPreLoginEvent extends Event implements Cancellable
 {
 
     private static final HandlerList handlers = new HandlerList();
@@ -15,6 +17,7 @@ public class TelnetPreLoginEvent extends TelnetEvent implements Cancellable
 
     public TelnetPreLoginEvent(String ip, String name, boolean bypassPassword)
     {
+        super(!Bukkit.getServer().isPrimaryThread());
         this.ip = ip;
         this.name = name;
         this.bypassPassword = bypassPassword;
@@ -26,6 +29,7 @@ public class TelnetPreLoginEvent extends TelnetEvent implements Cancellable
         return cancelled;
     }
 
+
     @Override
     public void setCancelled(boolean cancel)
     {
diff --git a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetRequestDataTagsEvent.java b/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetRequestDataTagsEvent.java
index c02b810..a196af6 100644
--- a/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetRequestDataTagsEvent.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/api/TelnetRequestDataTagsEvent.java
@@ -4,9 +4,10 @@ import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-public class TelnetRequestDataTagsEvent extends TelnetEvent
+public class TelnetRequestDataTagsEvent extends Event
 {
 
     private static final HandlerList handlers = new HandlerList();
@@ -14,6 +15,7 @@ public class TelnetRequestDataTagsEvent extends TelnetEvent
 
     public TelnetRequestDataTagsEvent()
     {
+        super(!Bukkit.getServer().isPrimaryThread());
         for (final Player player : Bukkit.getServer().getOnlinePlayers())
         {
             dataTags.put(player, new HashMap<String, Object>());