Dragonestia/msb3
3
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: fixed context loading sequence

Browse Source
This commit is contained in:
Andrey Terentev 2025-03-17 01:32:21 +07:00
parent 49b5ad6db4
commit a305d1806d
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/main/java/ru/dragonestia/msb3/api/boot/ServerBootstrap.java
View File

@ -92,17 +92,16 @@ public final class ServerBootstrap {
compileResourcePack(); compileResourcePack();
initializer.onResourcePackCompiled(Resources.getResourcePack()); initializer.onResourcePackCompiled(Resources.getResourcePack());
initPlayerContextManager();
initDefaultSkins();
initDefaultDialogActionsAndConditions();
NPCClickEvent.init();
DebugCommands.init();
} }
private void initDefaultModules() { private void initDefaultModules() {
ItemUtil.init(); ItemUtil.init();
PickableItem.registerEvent(); PickableItem.registerEvent();
initPlayerContextManager();
initDefaultSkins();
initDefaultDialogActionsAndConditions();
NPCClickEvent.init();
DebugCommands.init();
} }
private void compileResourcePack() { private void compileResourcePack() {
@ -180,7 +179,7 @@ public final class ServerBootstrap {
}).addListener(PlayerSpawnEvent.class, event -> { }).addListener(PlayerSpawnEvent.class, event -> {
var player = (MsbPlayer) event.getPlayer(); var player = (MsbPlayer) event.getPlayer();
player.emitSpawnSignalForContexts(); if (event.isFirstSpawn()) player.emitSpawnSignalForContexts();
}).addListener(PlayerDisconnectEvent.class, event -> { }).addListener(PlayerDisconnectEvent.class, event -> {
var player = (MsbPlayer) event.getPlayer(); var player = (MsbPlayer) event.getPlayer();

4
api/src/main/java/ru/dragonestia/msb3/api/player/MsbPlayer.java
View File

@ -8,12 +8,12 @@ import org.jetbrains.annotations.NotNull;
import ru.dragonestia.msb3.api.util.UncheckedRunnable; import ru.dragonestia.msb3.api.util.UncheckedRunnable;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
public class MsbPlayer extends Player { public class MsbPlayer extends Player {
private final Map<String, PlayerContext> contexts = new HashMap<>(); private final Map<String, PlayerContext> contexts = new LinkedHashMap<>();
@Getter private final Instant startSessionTime = Instant.now(); @Getter private final Instant startSessionTime = Instant.now();
public MsbPlayer(@NotNull PlayerConnection playerConnection, @NotNull GameProfile gameProfile) { public MsbPlayer(@NotNull PlayerConnection playerConnection, @NotNull GameProfile gameProfile) {

4
api/src/main/java/ru/dragonestia/msb3/api/player/PlayerContextManager.java
View File

@ -7,7 +7,7 @@ import net.minestom.server.network.player.GameProfile;
import net.minestom.server.network.player.PlayerConnection; import net.minestom.server.network.player.PlayerConnection;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.HashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
@ -15,7 +15,7 @@ import java.util.function.Function;
@UtilityClass @UtilityClass
public class PlayerContextManager { public class PlayerContextManager {
private final Map<String, Function<MsbPlayer, ? extends PlayerContext>> contexts = new HashMap<>(); private final Map<String, Function<MsbPlayer, ? extends PlayerContext>> contexts = new LinkedHashMap<>();
public MsbPlayer create(@NotNull PlayerConnection playerConnection, @NotNull GameProfile gameProfile) { public MsbPlayer create(@NotNull PlayerConnection playerConnection, @NotNull GameProfile gameProfile) {
var player = new MsbPlayer(playerConnection, gameProfile); var player = new MsbPlayer(playerConnection, gameProfile);