Send global value packet after the scene host has finished initializing the scene

This commit is contained in:
KingRainbow44
2023-07-14 23:03:49 -04:00
parent f0775f70f3
commit f17339f1b6
5 changed files with 81 additions and 35 deletions

View File

@@ -13,42 +13,45 @@ public class HandlerEnterSceneDoneReq extends PacketHandler {
@Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
var player = session.getPlayer();
// Finished loading
session.getPlayer().setSceneLoadState(SceneLoadState.LOADED);
player.setSceneLoadState(SceneLoadState.LOADED);
// Done
session.send(new PacketPlayerTimeNotify(session.getPlayer())); // Probably not the right place
session.send(new PacketPlayerTimeNotify(player)); // Probably not the right place
// Spawn player in world
session.getPlayer().getScene().spawnPlayer(session.getPlayer());
player.getScene().spawnPlayer(player);
// Spawn other entites already in world
session.getPlayer().getScene().showOtherEntities(session.getPlayer());
player.getScene().showOtherEntities(player);
// Locations
session.send(new PacketWorldPlayerLocationNotify(session.getPlayer().getWorld()));
session.send(new PacketScenePlayerLocationNotify(session.getPlayer().getScene()));
session.send(new PacketWorldPlayerRTTNotify(session.getPlayer().getWorld()));
session.send(new PacketWorldPlayerLocationNotify(player.getWorld()));
session.send(new PacketScenePlayerLocationNotify(player.getScene()));
session.send(new PacketWorldPlayerRTTNotify(player.getWorld()));
// spawn NPC
session.getPlayer().getScene().loadNpcForPlayerEnter(session.getPlayer());
player.getScene().loadNpcForPlayerEnter(player);
// notify client to load the npc for quest
var questGroupSuites =
session.getPlayer().getQuestManager().getSceneGroupSuite(session.getPlayer().getSceneId());
player.getQuestManager().getSceneGroupSuite(player.getSceneId());
session.getPlayer().getScene().loadGroupForQuest(questGroupSuites);
player.getScene().loadGroupForQuest(questGroupSuites);
Grasscutter.getLogger()
.trace(
"Loaded Scene {} Quest(s) Groupsuite(s): {}",
session.getPlayer().getSceneId(),
player.getSceneId(),
questGroupSuites);
session.send(new PacketGroupSuiteNotify(questGroupSuites));
// Reset timer for sending player locations
session.getPlayer().resetSendPlayerLocTime();
player.resetSendPlayerLocTime();
// Rsp
session.send(new PacketEnterSceneDoneRsp(session.getPlayer()));
session.send(new PacketEnterSceneDoneRsp(player));
}
}

View File

@@ -13,28 +13,33 @@ public class HandlerSceneInitFinishReq extends PacketHandler {
@Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
var player = session.getPlayer();
var world = player.getWorld();
// Info packets
session.send(new PacketServerTimeNotify());
session.send(new PacketWorldPlayerInfoNotify(session.getPlayer().getWorld()));
session.send(new PacketWorldDataNotify(session.getPlayer().getWorld()));
session.send(new PacketWorldPlayerInfoNotify(world));
session.send(new PacketWorldDataNotify(world));
session.send(new PacketPlayerWorldSceneInfoListNotify());
session.send(new BasePacket(PacketOpcodes.SceneForceUnlockNotify));
session.send(new PacketHostPlayerNotify(session.getPlayer().getWorld()));
session.send(new PacketHostPlayerNotify(world));
session.send(new PacketSceneTimeNotify(session.getPlayer()));
session.send(new PacketPlayerGameTimeNotify(session.getPlayer()));
session.send(new PacketPlayerEnterSceneInfoNotify(session.getPlayer()));
session.send(new PacketSceneAreaWeatherNotify(session.getPlayer()));
session.send(new PacketScenePlayerInfoNotify(session.getPlayer().getWorld()));
session.send(new PacketSceneTeamUpdateNotify(session.getPlayer()));
session.send(new PacketSceneTimeNotify(player));
session.send(new PacketPlayerGameTimeNotify(player));
session.send(new PacketPlayerEnterSceneInfoNotify(player));
session.send(new PacketSceneAreaWeatherNotify(player));
session.send(new PacketScenePlayerInfoNotify(world));
session.send(new PacketSceneTeamUpdateNotify(player));
session.send(new PacketSyncTeamEntityNotify(session.getPlayer()));
session.send(new PacketSyncScenePlayTeamEntityNotify(session.getPlayer()));
session.send(new PacketSyncTeamEntityNotify(player));
session.send(new PacketSyncScenePlayTeamEntityNotify(player));
// Done Packet
session.send(new PacketSceneInitFinishRsp(session.getPlayer()));
session.send(new PacketSceneInitFinishRsp(player));
// Set state
session.getPlayer().setSceneLoadState(SceneLoadState.INIT);
// Set scene load state.
player.setSceneLoadState(SceneLoadState.INIT);
// Run scene initialization.
player.getScene().playerSceneInitialized(player);
}
}