Merge remote-tracking branch 'origin/development' into development

src/main/java/emu/grasscutter/data/excels/ItemData.java

@@ -89,7 +89,14 @@ public class ItemData extends GameResource {
 
     @SerializedName(
             value = "roomSceneId",
-            alternate = {"BMEPAMCNABE", "DANFGGLKLNO", "JFDLJGDFIGL", "OHIANNAEEAK", "MFGACDIOHGF"})
+            alternate = {
+                "BMEPAMCNABE",
+                "DANFGGLKLNO",
+                "JFDLJGDFIGL",
+                "OHIANNAEEAK",
+                "MFGACDIOHGF",
+                "roomSceneID"
+            })
     private int roomSceneId;
 
     // Custom

src/main/java/emu/grasscutter/game/quest/content/ContentLeaveScene.java

@@ -12,6 +12,6 @@ public class ContentLeaveScene extends BaseContent {
     @Override
     public boolean execute(
             GameQuest quest, QuestData.QuestContentCondition condition, String paramStr, int... params) {
-        return quest.getOwner().getScene().getPrevScene() == params[0];
+        return condition.getParam()[0] == params[0];
     }
 }

src/main/java/emu/grasscutter/scripts/SceneScriptManager.java

@@ -99,7 +99,13 @@ public class SceneScriptManager {
     }
 
     public SceneConfig getConfig() {
-        return this.isInit ? this.meta.config : null;
+        for (int i = 0; i < 10; ++i) {
+            if (this.isInit) {
+                return this.meta.config;
+            }
+            Utils.sleep(100);
+        }
+        return null;
     }
 
     public Map<Integer, SceneBlock> getBlocks() {

src/main/java/emu/grasscutter/scripts/ScriptLib.java

@@ -244,12 +244,6 @@ public class ScriptLib {
             Grasscutter.getLogger().warn("trying to get suite that doesn't exist: {} {}", groupId, suite);
             return 1;
         }
-        // avoid spawn wrong monster
-        if(getSceneScriptManager().getScene().getChallenge() != null)
-            if(!getSceneScriptManager().getScene().getChallenge().inProgress() ||
-                getSceneScriptManager().getScene().getChallenge().getGroup().id != groupId){
-                return 0;
-            }
         this.getSceneScriptManager().addGroupSuite(groupInstance, suiteData);
 
         return 0;

src/main/java/emu/grasscutter/server/http/HttpServer.java

@@ -113,6 +113,7 @@ public final class HttpServer {
         }
 
         serverConnector.setPort(HTTP_INFO.bindPort);
+        serverConnector.setHost(HTTP_INFO.bindAddress);
         server.setConnectors(new ServerConnector[]{serverConnector});
 
         return server;

src/main/java/emu/grasscutter/server/packet/recv/HandlerPostEnterSceneReq.java

@@ -28,6 +28,7 @@ public class HandlerPostEnterSceneReq extends PacketHandler {
                 if (dungeonManager != null) dungeonManager.startDungeon();
             }
         }
+        questManager.queueEvent(QuestContent.QUEST_CONTENT_LEAVE_SCENE, scene.getPrevScene());
 
         session.send(new PacketPostEnterSceneRsp(session.getPlayer()));
     }

src/main/java/emu/grasscutter/server/packet/recv/HandlerUnlockPersonalLineReq.java

@@ -21,7 +21,6 @@ public class HandlerUnlockPersonalLineReq extends PacketHandler {
             return;
         }
 
-        session.getPlayer().getQuestManager().addQuest(data.getStartQuestId());
         session.getPlayer().addPersonalLine(data.getId());
         session.getPlayer().useLegendaryKey(1);