diff --git a/pom.xml b/pom.xml
index 1e1c848..b42b62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>pw.yumc</groupId>
     <artifactId>MiaoLobby</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <build>
         <finalName>${project.name}</finalName>
         <resources>
@@ -60,6 +60,7 @@
                         </goals>
                         <configuration>
                             <options>
+                                <option>-repackageclasses \ʼ.ʽ.ʾ.${project.artifactId}</option>
                                 <option>-keep class ${project.groupId}.${project.artifactId}.${project.artifactId}</option>
                             </options>
                             <libs>
diff --git a/src/main/java/pw/yumc/MiaoLobby/Util.java b/src/main/java/pw/yumc/MiaoLobby/Util.java
index 13d9964..dca2f4b 100644
--- a/src/main/java/pw/yumc/MiaoLobby/Util.java
+++ b/src/main/java/pw/yumc/MiaoLobby/Util.java
@@ -26,6 +26,7 @@ public class Util {
     private static Map<String, BukkitTask> tasks;
 
     public static void delayTp(final Player player) {
+        if (player == null) { return; }
         tasks.put(player.getName(), new BukkitRunnable() {
             int delay = config.AutoTPDelay;
 
@@ -45,9 +46,11 @@ public class Util {
     }
 
     public static void cancel(Player player) {
-        BukkitTask task = tasks.get(player.getName());
-        if (task != null) {
-            task.cancel();
+        if (player != null) {
+            BukkitTask task = tasks.get(player.getName());
+            if (task != null) {
+                task.cancel();
+            }
         }
     }
 
diff --git a/src/main/java/pw/yumc/MiaoLobby/hook/AuthMeHook.java b/src/main/java/pw/yumc/MiaoLobby/hook/AuthMeHook.java
index c60a2a1..a5aae5c 100644
--- a/src/main/java/pw/yumc/MiaoLobby/hook/AuthMeHook.java
+++ b/src/main/java/pw/yumc/MiaoLobby/hook/AuthMeHook.java
@@ -8,6 +8,8 @@ import pw.yumc.MiaoLobby.Util;
 public class AuthMeHook extends Hook {
     @EventHandler
     public void onLogin(final LoginEvent e) {
-        Util.delayTp(e.getPlayer());
+        if (e.isLogin()) {
+            Util.delayTp(e.getPlayer());
+        }
     }
 }
diff --git a/src/main/java/pw/yumc/MiaoLobby/hook/VBossAuthHook.java b/src/main/java/pw/yumc/MiaoLobby/hook/VBossAuthHook.java
index 2efa740..dd9ed22 100644
--- a/src/main/java/pw/yumc/MiaoLobby/hook/VBossAuthHook.java
+++ b/src/main/java/pw/yumc/MiaoLobby/hook/VBossAuthHook.java
@@ -9,7 +9,9 @@ import pw.yumc.MiaoLobby.Util;
 public class VBossAuthHook extends Hook {
     @EventHandler
     public void onLogin(LoginEvent e) {
-        Util.delayTp(e.getPlayer());
+        if (e.isLogin()) {
+            Util.delayTp(e.getPlayer());
+        }
     }
 
     @EventHandler