diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..d8e9561
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+    <option name="description" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index fbc451d..30deecb 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://files.minecraftforge.net/maven/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.minecraftforge.net/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 327b2eb..512523f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
-    <list size="1">
+    <list size="4">
       <item index="0" class="java.lang.String" itemvalue="net.minecraftforge.eventbus.api.SubscribeEvent" />
+      <item index="1" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.Mod" />
+      <item index="2" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.Mod.EventHandler" />
+      <item index="3" class="java.lang.String" itemvalue="net.minecraftforge.fml.common.eventhandler.SubscribeEvent" />
     </list>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/TwitchSpawn-1.16.main.iml b/.idea/modules/TwitchSpawn-1.16.main.iml
new file mode 100644
index 0000000..f39161e
--- /dev/null
+++ b/.idea/modules/TwitchSpawn-1.16.main.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>FORGE</platformType>
+          <platformType>MCP</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+  <component name="McpModuleSettings">
+    <option name="mappingFile" value="D:\IntelliJ IDEA Workspace\TwitchSpawn-1.16\build\createMcpToSrg\output.tsrg" />
+    <option name="mcpVersion" value="snapshot_20200707-1.16.1" />
+    <option name="minecraftVersion" value="1.16.1" />
+    <option name="srgType" value="TSRG" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/TwitchSpawn-1.16.test.iml b/.idea/modules/TwitchSpawn-1.16.test.iml
new file mode 100644
index 0000000..f39161e
--- /dev/null
+++ b/.idea/modules/TwitchSpawn-1.16.test.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>FORGE</platformType>
+          <platformType>MCP</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+  <component name="McpModuleSettings">
+    <option name="mappingFile" value="D:\IntelliJ IDEA Workspace\TwitchSpawn-1.16\build\createMcpToSrg\output.tsrg" />
+    <option name="mcpVersion" value="snapshot_20200707-1.16.1" />
+    <option name="minecraftVersion" value="1.16.1" />
+    <option name="srgType" value="TSRG" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/TwitchSpawn.java b/src/main/java/net/programmer/igoodie/twitchspawn/TwitchSpawn.java
index 7d79531..0e7f5c6 100644
--- a/src/main/java/net/programmer/igoodie/twitchspawn/TwitchSpawn.java
+++ b/src/main/java/net/programmer/igoodie/twitchspawn/TwitchSpawn.java
@@ -7,11 +7,13 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingStage;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -21,6 +23,7 @@
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.network.NetworkDirection;
 import net.programmer.igoodie.twitchspawn.client.gui.GlobalChatCooldownOverlay;
 import net.programmer.igoodie.twitchspawn.client.gui.StatusIndicatorOverlay;
@@ -65,7 +68,9 @@ private void commonSetup(final FMLCommonSetupEvent event) {
 
         } catch (TwitchSpawnLoadingErrors e) {
             e.bindFMLWarnings(ModLoadingStage.COMMON_SETUP);
-            throw new RuntimeException("TwitchSpawn loading errors occurred");
+            if (FMLEnvironment.dist == Dist.DEDICATED_SERVER) {
+                throw new RuntimeException("TwitchSpawn loading errors occurred");
+            }
         }
     }