diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java index 280b62623..f81efb07a 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java @@ -17,7 +17,7 @@ public class PacketGetSceneAreaRsp extends BasePacket { GetSceneAreaRsp p = GetSceneAreaRsp.newBuilder() .setSceneId(sceneId) - .addAllAreaIdList(Arrays.stream(new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,100,101,102,103,200,210,300}).boxed().collect(Collectors.toList())) + .addAllAreaIdList(Arrays.stream(new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,100,101,102,103,200,210,300,400,401,402,403}).boxed().collect(Collectors.toList())) .addCityInfoList(CityInfo.newBuilder().setCityId(1).setLevel(1).build()) .addCityInfoList(CityInfo.newBuilder().setCityId(2).setLevel(1).build()) .addCityInfoList(CityInfo.newBuilder().setCityId(3).setLevel(1).build()) diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java index 953bb679c..44a4ca006 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java @@ -46,7 +46,7 @@ public class PacketPlayerEnterSceneNotify extends BasePacket { player.setEnterSceneToken(Utils.randomRange(1000, 99999)); - PlayerEnterSceneNotify proto = PlayerEnterSceneNotify.newBuilder() + PlayerEnterSceneNotify.Builder proto = PlayerEnterSceneNotify.newBuilder() .setPrevSceneId(player.getSceneId()) .setPrevPos(player.getPos().toProto()) .setSceneId(newScene) @@ -57,15 +57,13 @@ public class PacketPlayerEnterSceneNotify extends BasePacket { .setEnterSceneToken(player.getEnterSceneToken()) .setWorldLevel(target.getWorld().getWorldLevel()) .setEnterReason(reason.getValue()) - .addSceneTagIdList(102) - .addSceneTagIdList(107) - .addSceneTagIdList(109) - .addSceneTagIdList(113) - .addSceneTagIdList(117) .setWorldType(1) - .setSceneTransaction(newScene + "-" + target.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402) - .build(); - - this.setData(proto); + .setSceneTransaction(newScene + "-" + target.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402); + + for(int i = 0; i < 3000; i++) { + proto.addSceneTagIdList(i); + } + + this.setData(proto.build()); } } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java index bf9b029a7..51b6fef10 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java @@ -13,7 +13,7 @@ public class PacketPlayerWorldSceneInfoListNotify extends BasePacket { public PacketPlayerWorldSceneInfoListNotify() { super(PacketOpcodes.PlayerWorldSceneInfoListNotify); // Rename opcode later - PlayerWorldSceneInfoListNotify proto = PlayerWorldSceneInfoListNotify.newBuilder() + PlayerWorldSceneInfoListNotify.Builder proto = PlayerWorldSceneInfoListNotify.newBuilder() .addInfoList( PlayerWorldSceneInfo.newBuilder() .setSceneId(1) @@ -55,9 +55,18 @@ public class PacketPlayerWorldSceneInfoListNotify extends BasePacket { .setSceneId(7) .setIsLocked(false) .build() - ) - .build(); - + ); + + var gaa = PlayerWorldSceneInfo.newBuilder() + .setSceneId(9) + .setIsLocked(false); + + for(int i = 0; i < 3000; i++) { + gaa.addSceneTagIdList(i); + } + + proto.addInfoList(gaa); + this.setData(proto); } }