mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-09-10 08:48:56 +03:00
Send global value packet after the scene host has finished initializing the scene
This commit is contained in:
@@ -1536,6 +1536,12 @@ public class Player implements PlayerHook, FieldFetch {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
return obj instanceof Player otherPlayer &&
|
||||||
|
this.id == otherPlayer.getUid();
|
||||||
|
}
|
||||||
|
|
||||||
public enum SceneLoadState {
|
public enum SceneLoadState {
|
||||||
NONE(0), LOADING(1), INIT(2), LOADED(3);
|
NONE(0), LOADING(1), INIT(2), LOADED(3);
|
||||||
|
|
||||||
@@ -1546,5 +1552,4 @@ public class Player implements PlayerHook, FieldFetch {
|
|||||||
this.value = value;
|
this.value = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -22,8 +22,8 @@ import emu.grasscutter.game.props.*;
|
|||||||
import emu.grasscutter.game.quest.QuestGroupSuite;
|
import emu.grasscutter.game.quest.QuestGroupSuite;
|
||||||
import emu.grasscutter.game.world.data.TeleportProperties;
|
import emu.grasscutter.game.world.data.TeleportProperties;
|
||||||
import emu.grasscutter.net.packet.BasePacket;
|
import emu.grasscutter.net.packet.BasePacket;
|
||||||
import emu.grasscutter.net.proto.*;
|
|
||||||
import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
|
import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult;
|
||||||
|
import emu.grasscutter.net.proto.*;
|
||||||
import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
|
import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
|
||||||
import emu.grasscutter.scripts.*;
|
import emu.grasscutter.scripts.*;
|
||||||
import emu.grasscutter.scripts.constants.EventType;
|
import emu.grasscutter.scripts.constants.EventType;
|
||||||
@@ -33,11 +33,12 @@ import emu.grasscutter.server.event.player.PlayerTeleportEvent;
|
|||||||
import emu.grasscutter.server.packet.send.*;
|
import emu.grasscutter.server.packet.send.*;
|
||||||
import emu.grasscutter.utils.objects.KahnsSort;
|
import emu.grasscutter.utils.objects.KahnsSort;
|
||||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||||
|
import lombok.*;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.*;
|
import java.util.concurrent.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import lombok.*;
|
|
||||||
|
|
||||||
public final class Scene {
|
public final class Scene {
|
||||||
@Getter private final World world;
|
@Getter private final World world;
|
||||||
@@ -51,7 +52,6 @@ public final class Scene {
|
|||||||
@Getter private final Set<SceneGroup> loadedGroups;
|
@Getter private final Set<SceneGroup> loadedGroups;
|
||||||
@Getter private final BlossomManager blossomManager;
|
@Getter private final BlossomManager blossomManager;
|
||||||
private final HashSet<Integer> unlockedForces;
|
private final HashSet<Integer> unlockedForces;
|
||||||
private final List<Runnable> afterLoadedCallbacks = new ArrayList<>();
|
|
||||||
private final long startWorldTime;
|
private final long startWorldTime;
|
||||||
@Getter @Setter DungeonManager dungeonManager;
|
@Getter @Setter DungeonManager dungeonManager;
|
||||||
@Getter Int2ObjectMap<Route> sceneRoutes;
|
@Getter Int2ObjectMap<Route> sceneRoutes;
|
||||||
@@ -68,6 +68,9 @@ public final class Scene {
|
|||||||
@Getter private int tickCount = 0;
|
@Getter private int tickCount = 0;
|
||||||
@Getter private boolean isPaused = false;
|
@Getter private boolean isPaused = false;
|
||||||
|
|
||||||
|
private final List<Runnable> afterLoadedCallbacks = new ArrayList<>();
|
||||||
|
private final List<Runnable> afterHostInitCallbacks = new ArrayList<>();
|
||||||
|
|
||||||
@Getter private GameEntity sceneEntity;
|
@Getter private GameEntity sceneEntity;
|
||||||
|
|
||||||
public Scene(World world, SceneData sceneData) {
|
public Scene(World world, SceneData sceneData) {
|
||||||
@@ -106,6 +109,13 @@ public final class Scene {
|
|||||||
return this.getPlayers().size();
|
return this.getPlayers().size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return The scene's world's host.
|
||||||
|
*/
|
||||||
|
public Player getHost() {
|
||||||
|
return this.getWorld().getHost();
|
||||||
|
}
|
||||||
|
|
||||||
public GameEntity getEntityById(int id) {
|
public GameEntity getEntityById(int id) {
|
||||||
// Check if the scene's entity ID is referenced.
|
// Check if the scene's entity ID is referenced.
|
||||||
if (id == 0x13800001) return this.sceneEntity;
|
if (id == 0x13800001) return this.sceneEntity;
|
||||||
@@ -678,6 +688,29 @@ public final class Scene {
|
|||||||
this.afterLoadedCallbacks.add(runnable);
|
this.afterLoadedCallbacks.add(runnable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invoked when a player initializes loading the scene.
|
||||||
|
*
|
||||||
|
* @param player The player that initialized loading the scene.
|
||||||
|
*/
|
||||||
|
public void playerSceneInitialized(Player player) {
|
||||||
|
// Check if the player is the host.
|
||||||
|
if (!player.equals(this.getHost())) return;
|
||||||
|
|
||||||
|
// Run all callbacks.
|
||||||
|
this.afterHostInitCallbacks.forEach(Runnable::run);
|
||||||
|
this.afterHostInitCallbacks.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a callback when the host initializes loading the scene.
|
||||||
|
*
|
||||||
|
* @param runnable The callback to be executed.
|
||||||
|
*/
|
||||||
|
public void runWhenHostInitialized(Runnable runnable) {
|
||||||
|
this.afterHostInitCallbacks.add(runnable);
|
||||||
|
}
|
||||||
|
|
||||||
public int getEntityLevel(int baseLevel, int worldLevelOverride) {
|
public int getEntityLevel(int baseLevel, int worldLevelOverride) {
|
||||||
int level = worldLevelOverride > 0 ? worldLevelOverride + baseLevel - 22 : baseLevel;
|
int level = worldLevelOverride > 0 ? worldLevelOverride + baseLevel - 22 : baseLevel;
|
||||||
level = Math.min(level, 100);
|
level = Math.min(level, 100);
|
||||||
|
@@ -514,8 +514,8 @@ public class ScriptLib {
|
|||||||
var entity = scene.getEntityByConfigId(cfgId);
|
var entity = scene.getEntityByConfigId(cfgId);
|
||||||
if (entity == null) return 2;
|
if (entity == null) return 2;
|
||||||
|
|
||||||
scene.broadcastPacket(
|
scene.runWhenHostInitialized(() -> scene.broadcastPacket(
|
||||||
new PacketServerGlobalValueChangeNotify(entity, sgvName, value));
|
new PacketServerGlobalValueChangeNotify(entity, sgvName, value)));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -528,7 +528,7 @@ public class ScriptLib {
|
|||||||
|
|
||||||
var scene = scriptManager.getScene();
|
var scene = scriptManager.getScene();
|
||||||
|
|
||||||
scene.runWhenFinished(() -> scene.broadcastPacket(
|
scene.runWhenHostInitialized(() -> scene.broadcastPacket(
|
||||||
new PacketServerGlobalValueChangeNotify(entityId, sgvName, value)));
|
new PacketServerGlobalValueChangeNotify(entityId, sgvName, value)));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@@ -13,42 +13,45 @@ public class HandlerEnterSceneDoneReq extends PacketHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
var player = session.getPlayer();
|
||||||
|
|
||||||
// Finished loading
|
// Finished loading
|
||||||
session.getPlayer().setSceneLoadState(SceneLoadState.LOADED);
|
player.setSceneLoadState(SceneLoadState.LOADED);
|
||||||
|
|
||||||
// Done
|
// 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
|
// Spawn player in world
|
||||||
session.getPlayer().getScene().spawnPlayer(session.getPlayer());
|
player.getScene().spawnPlayer(player);
|
||||||
|
|
||||||
// Spawn other entites already in world
|
// Spawn other entites already in world
|
||||||
session.getPlayer().getScene().showOtherEntities(session.getPlayer());
|
player.getScene().showOtherEntities(player);
|
||||||
|
|
||||||
// Locations
|
// Locations
|
||||||
session.send(new PacketWorldPlayerLocationNotify(session.getPlayer().getWorld()));
|
session.send(new PacketWorldPlayerLocationNotify(player.getWorld()));
|
||||||
session.send(new PacketScenePlayerLocationNotify(session.getPlayer().getScene()));
|
session.send(new PacketScenePlayerLocationNotify(player.getScene()));
|
||||||
session.send(new PacketWorldPlayerRTTNotify(session.getPlayer().getWorld()));
|
session.send(new PacketWorldPlayerRTTNotify(player.getWorld()));
|
||||||
|
|
||||||
// spawn NPC
|
// spawn NPC
|
||||||
session.getPlayer().getScene().loadNpcForPlayerEnter(session.getPlayer());
|
player.getScene().loadNpcForPlayerEnter(player);
|
||||||
|
|
||||||
// notify client to load the npc for quest
|
// notify client to load the npc for quest
|
||||||
var questGroupSuites =
|
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()
|
Grasscutter.getLogger()
|
||||||
.trace(
|
.trace(
|
||||||
"Loaded Scene {} Quest(s) Groupsuite(s): {}",
|
"Loaded Scene {} Quest(s) Groupsuite(s): {}",
|
||||||
session.getPlayer().getSceneId(),
|
player.getSceneId(),
|
||||||
questGroupSuites);
|
questGroupSuites);
|
||||||
session.send(new PacketGroupSuiteNotify(questGroupSuites));
|
session.send(new PacketGroupSuiteNotify(questGroupSuites));
|
||||||
|
|
||||||
// Reset timer for sending player locations
|
// Reset timer for sending player locations
|
||||||
session.getPlayer().resetSendPlayerLocTime();
|
player.resetSendPlayerLocTime();
|
||||||
|
|
||||||
// Rsp
|
// Rsp
|
||||||
session.send(new PacketEnterSceneDoneRsp(session.getPlayer()));
|
session.send(new PacketEnterSceneDoneRsp(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -13,28 +13,33 @@ public class HandlerSceneInitFinishReq extends PacketHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||||
|
var player = session.getPlayer();
|
||||||
|
var world = player.getWorld();
|
||||||
|
|
||||||
// Info packets
|
// Info packets
|
||||||
session.send(new PacketServerTimeNotify());
|
session.send(new PacketServerTimeNotify());
|
||||||
session.send(new PacketWorldPlayerInfoNotify(session.getPlayer().getWorld()));
|
session.send(new PacketWorldPlayerInfoNotify(world));
|
||||||
session.send(new PacketWorldDataNotify(session.getPlayer().getWorld()));
|
session.send(new PacketWorldDataNotify(world));
|
||||||
session.send(new PacketPlayerWorldSceneInfoListNotify());
|
session.send(new PacketPlayerWorldSceneInfoListNotify());
|
||||||
session.send(new BasePacket(PacketOpcodes.SceneForceUnlockNotify));
|
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 PacketSceneTimeNotify(player));
|
||||||
session.send(new PacketPlayerGameTimeNotify(session.getPlayer()));
|
session.send(new PacketPlayerGameTimeNotify(player));
|
||||||
session.send(new PacketPlayerEnterSceneInfoNotify(session.getPlayer()));
|
session.send(new PacketPlayerEnterSceneInfoNotify(player));
|
||||||
session.send(new PacketSceneAreaWeatherNotify(session.getPlayer()));
|
session.send(new PacketSceneAreaWeatherNotify(player));
|
||||||
session.send(new PacketScenePlayerInfoNotify(session.getPlayer().getWorld()));
|
session.send(new PacketScenePlayerInfoNotify(world));
|
||||||
session.send(new PacketSceneTeamUpdateNotify(session.getPlayer()));
|
session.send(new PacketSceneTeamUpdateNotify(player));
|
||||||
|
|
||||||
session.send(new PacketSyncTeamEntityNotify(session.getPlayer()));
|
session.send(new PacketSyncTeamEntityNotify(player));
|
||||||
session.send(new PacketSyncScenePlayTeamEntityNotify(session.getPlayer()));
|
session.send(new PacketSyncScenePlayTeamEntityNotify(player));
|
||||||
|
|
||||||
// Done Packet
|
// Done Packet
|
||||||
session.send(new PacketSceneInitFinishRsp(session.getPlayer()));
|
session.send(new PacketSceneInitFinishRsp(player));
|
||||||
|
|
||||||
// Set state
|
// Set scene load state.
|
||||||
session.getPlayer().setSceneLoadState(SceneLoadState.INIT);
|
player.setSceneLoadState(SceneLoadState.INIT);
|
||||||
|
// Run scene initialization.
|
||||||
|
player.getScene().playerSceneInitialized(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user