v1.8.4 修复BUG

SoBadFish · Sep 20, 2022 · 75016c8 · 75016c8
1 parent f08b9c2
commit 75016c8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/org/sobadfish/bedwar/manager/RoomManager.java b/src/main/java/org/sobadfish/bedwar/manager/RoomManager.java
@@ -755,7 +755,8 @@ public void onBlockBurn(BlockBurnEvent event){
     @EventHandler
     public void onLevelTransfer(EntityLevelChangeEvent event){
         Entity entity = event.getEntity();
-        GameRoom room = getGameRoomByLevel(event.getTarget());
+        Level level = event.getTarget();
+        GameRoom room = getGameRoomByLevel(level);
         if(entity instanceof EntityHuman) {
             PlayerInfo info = getPlayerInfo((EntityHuman) entity);
             if(info == null){
@@ -788,11 +789,14 @@ public void onLevelTransfer(EntityLevelChangeEvent event){
                             info.getPlayer().teleport(info.getPlayer().getLevel().getSafeSpawn());
                         }
                         break;
+                    default:break;
                 }
 
             }else{
-                if(info.getGameRoom() != null){
-                    info.getGameRoom().quitPlayerInfo(info,false);
+                if(info.getGameRoom() != null ){
+                    if(!info.getGameRoom().getWorldInfo().getConfig().getWaitPosition().getLevel().getFolderName().equalsIgnoreCase(level.getFolderName())) {
+                        info.getGameRoom().quitPlayerInfo(info, false);
+                    }
                 }
             }
         }