mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 22:49:56 +08:00
Fix player fields not being set
line seps r weird
This commit is contained in:
KingRainbow44
+105
-105
@@ -1,105 +1,105 @@
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.player.Player.SceneLoadState;
|
||||
import emu.grasscutter.game.props.EnterReason;
|
||||
import emu.grasscutter.game.world.data.TeleportProperties;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
|
||||
import emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify;
|
||||
import emu.grasscutter.utils.Position;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
|
||||
public class PacketPlayerEnterSceneNotify extends BasePacket {
|
||||
|
||||
// Login
|
||||
public PacketPlayerEnterSceneNotify(Player player) {
|
||||
super(PacketOpcodes.PlayerEnterSceneNotify);
|
||||
|
||||
player.setSceneLoadState(SceneLoadState.LOADING);
|
||||
player.setEnterSceneToken(Utils.randomRange(1000, 99999));
|
||||
|
||||
var proto =
|
||||
PlayerEnterSceneNotify.newBuilder()
|
||||
.setSceneId(player.getSceneId())
|
||||
.setPos(player.getPosition().toProto())
|
||||
.setSceneBeginTime(System.currentTimeMillis())
|
||||
.setType(EnterType.ENTER_TYPE_SELF)
|
||||
.setTargetUid(player.getUid())
|
||||
.setEnterSceneToken(player.getEnterSceneToken())
|
||||
.setWorldLevel(player.getWorldLevel())
|
||||
.setEnterReason(EnterReason.Login.getValue())
|
||||
.setIsFirstLoginEnterScene(player.isFirstLoginEnterScene())
|
||||
.setWorldType(1)
|
||||
.setSceneTransaction(
|
||||
"3-"
|
||||
+ player.getUid()
|
||||
+ "-"
|
||||
+ (int) (System.currentTimeMillis() / 1000)
|
||||
+ "-"
|
||||
+ 18402);
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
|
||||
public PacketPlayerEnterSceneNotify(
|
||||
Player player, EnterType type, EnterReason reason, int newScene, Position newPos) {
|
||||
this(player, player, type, reason, newScene, newPos);
|
||||
}
|
||||
|
||||
public PacketPlayerEnterSceneNotify(Player player, TeleportProperties teleportProperties) {
|
||||
this(player, player, teleportProperties);
|
||||
}
|
||||
|
||||
public PacketPlayerEnterSceneNotify(
|
||||
Player player,
|
||||
Player target,
|
||||
EnterType type,
|
||||
EnterReason reason,
|
||||
int newScene,
|
||||
Position newPos) {
|
||||
this(
|
||||
player,
|
||||
target,
|
||||
TeleportProperties.builder()
|
||||
.enterType(type)
|
||||
.enterReason(reason)
|
||||
.sceneId(newScene)
|
||||
.teleportTo(newPos)
|
||||
.build());
|
||||
}
|
||||
|
||||
// Teleport or go somewhere
|
||||
public PacketPlayerEnterSceneNotify(
|
||||
Player player, Player target, TeleportProperties teleportProperties) {
|
||||
super(PacketOpcodes.PlayerEnterSceneNotify);
|
||||
|
||||
player.setSceneLoadState(SceneLoadState.LOADING);
|
||||
player.setEnterSceneToken(Utils.randomRange(1000, 99999));
|
||||
|
||||
var proto =
|
||||
PlayerEnterSceneNotify.newBuilder()
|
||||
.setPrevSceneId(player.getSceneId())
|
||||
.setPrevPos(player.getPosition().toProto())
|
||||
.setSceneId(teleportProperties.getSceneId())
|
||||
.setPos(teleportProperties.getTeleportTo().toProto())
|
||||
.setSceneBeginTime(System.currentTimeMillis())
|
||||
.setType(teleportProperties.getEnterType())
|
||||
.setTargetUid(target.getUid())
|
||||
.setEnterSceneToken(player.getEnterSceneToken())
|
||||
.setWorldLevel(target.getWorld().getWorldLevel())
|
||||
.setEnterReason(teleportProperties.getEnterReason().getValue())
|
||||
.setWorldType(1)
|
||||
.setSceneTransaction(
|
||||
teleportProperties.getSceneId()
|
||||
+ "-"
|
||||
+ target.getUid()
|
||||
+ "-"
|
||||
+ (int) (System.currentTimeMillis() / 1000)
|
||||
+ "-"
|
||||
+ 18402);
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
}
|
||||
package emu.grasscutter.server.packet.send;
|
||||
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.player.Player.SceneLoadState;
|
||||
import emu.grasscutter.game.props.EnterReason;
|
||||
import emu.grasscutter.game.world.data.TeleportProperties;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
|
||||
import emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify;
|
||||
import emu.grasscutter.utils.Position;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
|
||||
public class PacketPlayerEnterSceneNotify extends BasePacket {
|
||||
|
||||
// Login
|
||||
public PacketPlayerEnterSceneNotify(Player player) {
|
||||
super(PacketOpcodes.PlayerEnterSceneNotify);
|
||||
|
||||
player.setSceneLoadState(SceneLoadState.LOADING);
|
||||
player.setEnterSceneToken(Utils.randomRange(1000, 99999));
|
||||
|
||||
var proto =
|
||||
PlayerEnterSceneNotify.newBuilder()
|
||||
.setSceneId(player.getSceneId())
|
||||
.setPos(player.getPosition().toProto())
|
||||
.setSceneBeginTime(System.currentTimeMillis())
|
||||
.setType(EnterType.ENTER_TYPE_SELF)
|
||||
.setTargetUid(player.getUid())
|
||||
.setEnterSceneToken(player.getEnterSceneToken())
|
||||
.setWorldLevel(player.getWorldLevel())
|
||||
.setEnterReason(EnterReason.Login.getValue())
|
||||
.setIsFirstLoginEnterScene(player.isFirstLoginEnterScene())
|
||||
.setWorldType(1)
|
||||
.setSceneTransaction(
|
||||
"3-"
|
||||
+ player.getUid()
|
||||
+ "-"
|
||||
+ (int) (System.currentTimeMillis() / 1000)
|
||||
+ "-"
|
||||
+ 18402);
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
|
||||
public PacketPlayerEnterSceneNotify(
|
||||
Player player, EnterType type, EnterReason reason, int newScene, Position newPos) {
|
||||
this(player, player, type, reason, newScene, newPos);
|
||||
}
|
||||
|
||||
public PacketPlayerEnterSceneNotify(Player player, TeleportProperties teleportProperties) {
|
||||
this(player, player, teleportProperties);
|
||||
}
|
||||
|
||||
public PacketPlayerEnterSceneNotify(
|
||||
Player player,
|
||||
Player target,
|
||||
EnterType type,
|
||||
EnterReason reason,
|
||||
int newScene,
|
||||
Position newPos) {
|
||||
this(
|
||||
player,
|
||||
target,
|
||||
TeleportProperties.builder()
|
||||
.enterType(type)
|
||||
.enterReason(reason)
|
||||
.sceneId(newScene)
|
||||
.teleportTo(newPos)
|
||||
.build());
|
||||
}
|
||||
|
||||
// Teleport or go somewhere
|
||||
public PacketPlayerEnterSceneNotify(
|
||||
Player player, Player target, TeleportProperties teleportProperties) {
|
||||
super(PacketOpcodes.PlayerEnterSceneNotify);
|
||||
|
||||
player.setSceneLoadState(SceneLoadState.LOADING);
|
||||
player.setEnterSceneToken(Utils.randomRange(1000, 99999));
|
||||
|
||||
var proto =
|
||||
PlayerEnterSceneNotify.newBuilder()
|
||||
.setPrevSceneId(player.getSceneId())
|
||||
.setPrevPos(player.getPosition().toProto())
|
||||
.setSceneId(teleportProperties.getSceneId())
|
||||
.setPos(teleportProperties.getTeleportTo().toProto())
|
||||
.setSceneBeginTime(System.currentTimeMillis())
|
||||
.setType(teleportProperties.getEnterType())
|
||||
.setTargetUid(target.getUid())
|
||||
.setEnterSceneToken(player.getEnterSceneToken())
|
||||
.setWorldLevel(target.getWorld().getWorldLevel())
|
||||
.setEnterReason(teleportProperties.getEnterReason().getValue())
|
||||
.setWorldType(1)
|
||||
.setSceneTransaction(
|
||||
teleportProperties.getSceneId()
|
||||
+ "-"
|
||||
+ target.getUid()
|
||||
+ "-"
|
||||
+ (int) (System.currentTimeMillis() / 1000)
|
||||
+ "-"
|
||||
+ 18402);
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user