2026.02.06-aa1b071c2

This commit is contained in:
Intege-rs
2026-02-06 03:24:16 -05:00
parent 480cf742c8
commit 74a97c7da9

View File

@@ -52,7 +52,6 @@ import com.hypixel.hytale.server.core.Constants;
import com.hypixel.hytale.server.core.HytaleServer; import com.hypixel.hytale.server.core.HytaleServer;
import com.hypixel.hytale.server.core.HytaleServerConfig; import com.hypixel.hytale.server.core.HytaleServerConfig;
import com.hypixel.hytale.server.core.Message; import com.hypixel.hytale.server.core.Message;
import com.hypixel.hytale.server.core.NameMatching;
import com.hypixel.hytale.server.core.asset.common.CommonAssetModule; import com.hypixel.hytale.server.core.asset.common.CommonAssetModule;
import com.hypixel.hytale.server.core.asset.type.blocktype.config.BlockType; import com.hypixel.hytale.server.core.asset.type.blocktype.config.BlockType;
import com.hypixel.hytale.server.core.asset.type.model.config.Model; import com.hypixel.hytale.server.core.asset.type.model.config.Model;
@@ -106,7 +105,6 @@ import java.net.InetSocketAddress;
import java.util.Collections; import java.util.Collections;
import java.util.Deque; import java.util.Deque;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentLinkedDeque;
@@ -658,35 +656,6 @@ public class GamePacketHandler extends GenericPacketHandler implements IPacketHa
} }
public void handle(@Nonnull UpdateMachinimaScene packet) { public void handle(@Nonnull UpdateMachinimaScene packet) {
Ref<EntityStore> ref = this.playerRef.getReference();
if (ref != null && ref.isValid()) {
Store<EntityStore> store = ref.getStore();
World world = store.getExternalData().getWorld();
world.execute(
() -> {
UpdateMachinimaScene updatePacket = new UpdateMachinimaScene(
this.playerRef.getUsername(), packet.sceneName, packet.frame, packet.updateType, packet.scene
);
if ("*".equals(packet.player)) {
for (PlayerRef otherPlayerRef : world.getPlayerRefs()) {
if (!Objects.equals(otherPlayerRef, this.playerRef)) {
otherPlayerRef.getPacketHandler().writeNoCache(updatePacket);
}
}
this.playerRef.sendMessage(Message.translation("server.io.gamepackethandler.sceneUpdateSent"));
} else {
PlayerRef target = NameMatching.DEFAULT.find(Universe.get().getPlayers(), packet.player, PlayerRef::getUsername);
if (target != null && target.getReference().getStore().getExternalData().getWorld() == world) {
target.getPacketHandler().write(updatePacket);
this.playerRef.sendMessage(Message.translation("server.io.gamepackethander.sceneUpdateSentToPlayer").param("name", target.getUsername()));
} else {
this.playerRef.sendMessage(Message.translation("server.io.gamepackethandler.playerNotFound").param("name", packet.player));
}
}
}
);
}
} }
public void handle(@Nonnull ClientReady packet) { public void handle(@Nonnull ClientReady packet) {