diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 56dd862..d2dfceb 100755
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,7 +10,7 @@
         <processorPath useClasspath="false">
           <entry name="$PROJECT_DIR$/ButtonProcessor/target/classes" />
           <entry name="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-SNAPSHOT.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156.jar" />
           <entry name="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0.jar" />
@@ -33,7 +33,7 @@
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.10/lombok-1.18.10.jar" />
           <entry name="$PROJECT_DIR$/ButtonProcessor/target/classes" />
           <entry name="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-SNAPSHOT.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-20180712.012057-156.jar" />
           <entry name="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0.jar" />
@@ -46,10 +46,10 @@
     <bytecodeTargetLevel>
       <module name="BuildConfigUpdater" target="8" />
       <module name="ButtonCore" target="1.5" />
-      <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" target="13" />
+      <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" target="12" />
       <module name="ButtonProcessor" target="8" />
       <module name="ChunkArchive" target="1.8" />
-      <module name="CorePOM" target="13" />
+      <module name="CorePOM" target="12" />
       <module name="RandomTeleport" target="1.8" />
     </bytecodeTargetLevel>
   </component>
diff --git a/BuildConfigUpdater/BuildConfigUpdater.iml b/BuildConfigUpdater/BuildConfigUpdater.iml
index 04dfdc0..74e6815 100644
--- a/BuildConfigUpdater/BuildConfigUpdater.iml
+++ b/BuildConfigUpdater/BuildConfigUpdater.iml
@@ -19,6 +19,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
     <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
+    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java b/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java
index 12cc43b..7e0769b 100644
--- a/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java
+++ b/ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java
@@ -6,6 +6,7 @@ import buttondevteam.lib.architecture.ConfigData;
 import buttondevteam.lib.chat.Command2;
 import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.ICommand2MC;
+import com.earth2me.essentials.Trade;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
@@ -13,9 +14,11 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 
 import java.io.*;
+import java.math.BigDecimal;
 
 public class SpawnComponent extends Component<MainPlugin> implements PluginMessageListener {
 	@Override
@@ -87,7 +90,11 @@ public class SpawnComponent extends Component<MainPlugin> implements PluginMessa
 		public void def(Player player) {
 			if (targetServer().get().length() == 0) {
 				player.sendMessage("§bTeleporting to spawn.");
-				player.teleport(spawnloc);
+				try {
+					MainPlugin.ess.getUser(player).getTeleport().teleport(spawnloc, new Trade(BigDecimal.ZERO, MainPlugin.ess), PlayerTeleportEvent.TeleportCause.COMMAND);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 				return;
 			}
 			ByteArrayDataOutput out = ByteStreams.newDataOutput();
diff --git a/CorePOM/pom.xml b/CorePOM/pom.xml
index 024d7eb..62bebbe 100755
--- a/CorePOM/pom.xml
+++ b/CorePOM/pom.xml
@@ -56,6 +56,16 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>12</source>
+                    <target>12</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <repositories>