diff --git a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java b/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java
index 4053fc1..798b9e4 100644
--- a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java
+++ b/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IBaseServerEvent;
 
+@SuppressWarnings({ "rawtypes" })
 public abstract class OriginBlacklistEvent {
   private final EnumConnectionType connectionType;
   private final IBaseServerEvent eaglerEvent;
diff --git a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java b/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java
index 548cb7e..7f9fd8c 100644
--- a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java
+++ b/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftLoginEvent;
 
+@SuppressWarnings({ "rawtypes" })
 public final class OriginBlacklistLoginEvent extends OriginBlacklistEvent {
   public OriginBlacklistLoginEvent(final IEaglercraftLoginEvent eaglerEvent, final Object javaEvent,
       final EnumConnectionType connectionType, final OPlayer player) {
diff --git a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java b/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java
index 0f6e51a..10afbb5 100644
--- a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java
+++ b/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent;
 
+@SuppressWarnings({ "rawtypes" })
 public final class OriginBlacklistMOTDEvent extends OriginBlacklistEvent {
   public OriginBlacklistMOTDEvent(final IEaglercraftMOTDEvent eaglerEvent, final Object javaEvent,
       final EnumConnectionType connectionType, final OPlayer player) {
diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java b/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java
index a70ee86..ec756fa 100644
--- a/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java
+++ b/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java
@@ -109,11 +109,29 @@ public final class OPlayer {
             port = (c >= '0' && c <= '9');
           }
 
-          if (port && a.indexOf('.') != -1) {
-            addr = a;
+          if (port) {
+            if (a.indexOf('.') != -1) {
+              addr = a;
+            }
           }
         }
       }
+
+      int c = 0;
+      boolean hex = true;
+      for (int j = 0; j < addr.length(); j++) {
+        char ch = addr.charAt(j);
+        if (ch == ':') {
+          c++;
+        } else if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) {
+          hex = false;
+          break;
+        }
+      }
+
+      if (hex && c == 6 && addr.indexOf("::") == -1) {
+        addr = addr + "::";
+      }
     }
 
     return addr;
diff --git a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java
index 40304c3..7922b2e 100644
--- a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java
+++ b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java
@@ -38,6 +38,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.CachedServerIcon;
 import org.semver4j.Semver;
 
+@SuppressWarnings({ "rawtypes" })
 public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin {
   private boolean papiPlaceholdersEnabled;
   private Object papi;
diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java
index 0bd2baa..3d6a713 100644
--- a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java
+++ b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java
@@ -33,7 +33,7 @@ import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.AdvancedPie;
 import org.semver4j.Semver;
 
-@SuppressWarnings({ "deprecation" })
+@SuppressWarnings({ "deprecation", "rawtypes" })
 public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin {
   private ProxyServer proxy;
   private boolean papiPlaceholdersEnabled;
diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java
index 3077718..641029a 100644
--- a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java
+++ b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java
@@ -39,7 +39,7 @@ import org.bstats.velocity.Metrics.Factory;
 import org.semver4j.Semver;
 import org.slf4j.Logger;
 
-@SuppressWarnings({ "deprecation", "unchecked" })
+@SuppressWarnings({ "deprecation", "unchecked", "rawtypes" })
 public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
   private final PluginContainer plugin;
   private final Factory metricsFactory;