Merge remote-tracking branch 'upstream/main'

src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtCreateGadgetNotify.java

@@ -20,13 +20,13 @@ public class HandlerEvtCreateGadgetNotify extends PacketHandler {
 		}
 		
 		// Sanity check - dont add duplicate entities
-		if (session.getPlayer().getWorld().getEntityById(notify.getEntityId()) != null) {
+		if (session.getPlayer().getScene().getEntityById(notify.getEntityId()) != null) {
 			return;
 		}
 		
 		// Create entity and summon in world
-		EntityClientGadget gadget = new EntityClientGadget(session.getPlayer().getWorld(), session.getPlayer(), notify);
-		session.getPlayer().getWorld().onPlayerCreateGadget(gadget);
+		EntityClientGadget gadget = new EntityClientGadget(session.getPlayer().getScene(), session.getPlayer(), notify);
+		session.getPlayer().getScene().onPlayerCreateGadget(gadget);
 	}
 
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDestroyGadgetNotify.java

@@ -18,7 +18,7 @@ public class HandlerEvtDestroyGadgetNotify extends PacketHandler {
 			return;
 		}
 
-		session.getPlayer().getWorld().onPlayerDestroyGadget(notify.getEntityId());
+		session.getPlayer().getScene().onPlayerDestroyGadget(notify.getEntityId());
 	}
 
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerSocialDetailReq.java

@@ -15,7 +15,7 @@ public class HandlerGetPlayerSocialDetailReq extends PacketHandler {
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		GetPlayerSocialDetailReq req = GetPlayerSocialDetailReq.parseFrom(payload);
 		
-		SocialDetail.Builder detail = session.getServer().getSocialDetailById(req.getUid());
+		SocialDetail.Builder detail = session.getServer().getSocialDetailByUid(req.getUid());
 
 		if (detail != null) {
 			detail.setIsFriend(session.getPlayer().getFriendsList().isFriendsWith(req.getUid()));

src/main/java/emu/grasscutter/server/packet/recv/HandlerMarkMapReq.java

 package emu.grasscutter.server.packet.recv;
 
 import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.World;
+import emu.grasscutter.game.props.EnterReason;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
 import emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq;
 import emu.grasscutter.net.proto.OperationOuterClass.Operation;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketPlayerEnterSceneNotify;
 import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
 
 @Opcodes(PacketOpcodes.MarkMapReq)
@@ -19,14 +23,18 @@ public class HandlerMarkMapReq extends PacketHandler {
 		if (req.getOp() != Operation.Add) {
 			return;
 		}
-		
+
 		session.getPlayer().getPos().setX(req.getMark().getPos().getX());
 		session.getPlayer().getPos().setZ(req.getMark().getPos().getZ());
 		session.getPlayer().getPos().setY(300);
 		
-		Grasscutter.getLogger().info("Player [" + session.getPlayer().getId() + ":" + session.getPlayer().getNickname() + "] tp to " + session.getPlayer().getPos());
+		Grasscutter.getLogger().info("Player [" + session.getPlayer().getUid() + ":" + session.getPlayer().getNickname() + "] tp to " + session.getPlayer().getPos() + " Scene id: " + req.getMark().getSceneId());
 		
-		session.getPlayer().getWorld().broadcastPacket(new PacketSceneEntityAppearNotify(session.getPlayer()));
+		if (req.getMark().getSceneId() != session.getPlayer().getSceneId()) {
+			session.getPlayer().getWorld().transferPlayerToScene(session.getPlayer(), req.getMark().getSceneId(), session.getPlayer().getPos());
+		} else {
+			session.getPlayer().getScene().broadcastPacket(new PacketSceneEntityAppearNotify(session.getPlayer()));
+		}
 	}
 
 }

src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneInitFinishReq.java

@@ -14,6 +14,7 @@ import emu.grasscutter.server.packet.send.PacketSceneInitFinishRsp;
 import emu.grasscutter.server.packet.send.PacketScenePlayerInfoNotify;
 import emu.grasscutter.server.packet.send.PacketSceneTeamUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketSceneTimeNotify;
+import emu.grasscutter.server.packet.send.PacketSceneUnlockInfoNotify;
 import emu.grasscutter.server.packet.send.PacketServerTimeNotify;
 import emu.grasscutter.server.packet.send.PacketSyncScenePlayTeamEntityNotify;
 import emu.grasscutter.server.packet.send.PacketSyncTeamEntityNotify;
@@ -29,13 +30,14 @@ public class HandlerSceneInitFinishReq extends PacketHandler {
 		session.send(new PacketServerTimeNotify());
 		session.send(new PacketWorldPlayerInfoNotify(session.getPlayer().getWorld()));
 		session.send(new PacketWorldDataNotify(session.getPlayer().getWorld()));
+		session.send(new PacketSceneUnlockInfoNotify());
 		session.send(new GenshinPacket(PacketOpcodes.SceneForceUnlockNotify));
 		session.send(new PacketHostPlayerNotify(session.getPlayer().getWorld()));
 		
 		session.send(new PacketSceneTimeNotify(session.getPlayer()));
-		session.send(new PacketPlayerGameTimeNotify(session.getPlayer().getWorld(), session.getPlayer()));
+		session.send(new PacketPlayerGameTimeNotify(session.getPlayer()));
 		session.send(new PacketPlayerEnterSceneInfoNotify(session.getPlayer()));
-		session.send(new PacketSceneAreaWeatherNotify(session.getPlayer().getWorld(), session.getPlayer()));
+		session.send(new PacketSceneAreaWeatherNotify(session.getPlayer()));
 		session.send(new PacketScenePlayerInfoNotify(session.getPlayer().getWorld()));
 		session.send(new PacketSceneTeamUpdateNotify(session.getPlayer()));
 		

src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java

@@ -57,7 +57,7 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
 			}
 			
 			// Save account
-			session.getAccount().setPlayerId(player.getId());
+			session.getAccount().setPlayerId(player.getUid());
 			session.getAccount().save();
 			
 			// Set character

src/main/java/emu/grasscutter/server/packet/send/PacketChangeGameTimeRsp.java

 package emu.grasscutter.server.packet.send;
 
+import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.World;
 import emu.grasscutter.net.packet.GenshinPacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
@@ -7,11 +8,11 @@ import emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp;
 
 public class PacketChangeGameTimeRsp extends GenshinPacket {
 	
-	public PacketChangeGameTimeRsp(World world) {
+	public PacketChangeGameTimeRsp(GenshinPlayer player) {
 		super(PacketOpcodes.ChangeGameTimeRsp);
 		
 		ChangeGameTimeRsp proto = ChangeGameTimeRsp.newBuilder()
-				.setCurGameTime(world.getTime())
+				.setCurGameTime(player.getScene().getTime())
 				.build();
 		
 		this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerAskFriendListRsp.java

@@ -14,7 +14,7 @@ public class PacketGetPlayerAskFriendListRsp extends GenshinPacket {
 		GetPlayerAskFriendListRsp.Builder proto = GetPlayerAskFriendListRsp.newBuilder();
 
 		for (Friendship friendship : player.getFriendsList().getPendingFriends().values()) {
-			if (friendship.getAskerId() == player.getId()) {
+			if (friendship.getAskerId() == player.getUid()) {
 				continue;
 			}
 			proto.addAskFriendList(friendship.toProto());

src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java

@@ -37,7 +37,7 @@ public class PacketGetPlayerFriendListRsp extends GenshinPacket {
 			proto.addFriendList(friendship.toProto());
 		}
 		for (Friendship friendship : player.getFriendsList().getPendingFriends().values()) {
-			if (friendship.getAskerId() == player.getId()) {
+			if (friendship.getAskerId() == player.getUid()) {
 				continue;
 			}
 			proto.addAskFriendList(friendship.toProto());

src/main/java/emu/grasscutter/server/packet/send/PacketGetSceneAreaRsp.java

@@ -16,8 +16,8 @@ public class PacketGetSceneAreaRsp extends GenshinPacket {
 		this.buildHeader(0);
 		
 		GetSceneAreaRsp p = GetSceneAreaRsp.newBuilder()
-				.setSceneId(3)
-				.addAllAreaIdList(Arrays.stream(new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19}).boxed().collect(Collectors.toList()))
+				.setSceneId(sceneId)
+				.addAllAreaIdList(Arrays.stream(new int[] {1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,100,101,102,103,200,210,300}).boxed().collect(Collectors.toList()))
 				.addCityInfoList(CityInfo.newBuilder().setCityId(1).setLevel(1).build())
 				.addCityInfoList(CityInfo.newBuilder().setCityId(2).setLevel(1).build())
 				.addCityInfoList(CityInfo.newBuilder().setCityId(3).setLevel(1).build())

src/main/java/emu/grasscutter/server/packet/send/PacketHostPlayerNotify.java

@@ -11,7 +11,7 @@ public class PacketHostPlayerNotify extends GenshinPacket {
 		super(PacketOpcodes.HostPlayerNotify);
 		
 		HostPlayerNotify proto = HostPlayerNotify.newBuilder()
-				.setHostUid(world.getHost().getId())
+				.setHostUid(world.getHost().getUid())
 				.setHostPeerId(world.getHost().getPeerId())
 				.build();
 		

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerApplyEnterMpResultNotify.java

@@ -12,7 +12,7 @@ public class PacketPlayerApplyEnterMpResultNotify extends GenshinPacket {
 		super(PacketOpcodes.PlayerApplyEnterMpResultNotify);
 
 		PlayerApplyEnterMpResultNotify proto = PlayerApplyEnterMpResultNotify.newBuilder()
-				.setTargetUid(target.getId())
+				.setTargetUid(target.getUid())
 				.setTargetNickname(target.getNickname())
 				.setIsAgreed(isAgreed)
 				.setReason(reason)

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerChatNotify.java

@@ -14,7 +14,7 @@ public class PacketPlayerChatNotify extends GenshinPacket {
 		
 		ChatInfo info = ChatInfo.newBuilder()
 				.setTime((int) (System.currentTimeMillis() / 1000))
-				.setUid(sender.getId())
+				.setUid(sender.getUid())
 				.setText(message)
 				.build();
 		
@@ -31,7 +31,7 @@ public class PacketPlayerChatNotify extends GenshinPacket {
 		
 		ChatInfo info = ChatInfo.newBuilder()
 				.setTime((int) (System.currentTimeMillis() / 1000))
-				.setUid(sender.getId())
+				.setUid(sender.getUid())
 				.setIcon(emote)
 				.build();
 		
@@ -48,7 +48,7 @@ public class PacketPlayerChatNotify extends GenshinPacket {
 		
 		ChatInfo info = ChatInfo.newBuilder()
 				.setTime((int) (System.currentTimeMillis() / 1000))
-				.setUid(sender.getId())
+				.setUid(sender.getUid())
 				.setSystemHint(systemHint)
 				.build();
 		

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java

@@ -24,17 +24,13 @@ public class PacketPlayerEnterSceneNotify extends GenshinPacket {
 				.setPos(player.getPos().toProto())
 				.setSceneBeginTime(System.currentTimeMillis())
 				.setType(EnterType.EnterSelf)
-				.setTargetUid(player.getId())
+				.setTargetUid(player.getUid())
 				.setEnterSceneToken(player.getEnterSceneToken())
 				.setWorldLevel(player.getWorldLevel())
 				.setEnterReason(EnterReason.Login.getValue())
 				.setIsFirstLoginEnterScene(player.isFirstLoginEnterScene())
-				.addSceneTagIdList(102)
-				.addSceneTagIdList(107)
-				.addSceneTagIdList(113)
-				.addSceneTagIdList(117)
 				.setUnk1(1)
-				.setUnk2("3-" + player.getId() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
+				.setUnk2("3-" + player.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
 				.build();
 		
 		this.setData(proto);
@@ -57,7 +53,7 @@ public class PacketPlayerEnterSceneNotify extends GenshinPacket {
 				.setPos(newPos.toProto())
 				.setSceneBeginTime(System.currentTimeMillis())
 				.setType(EnterType.EnterSelf)
-				.setTargetUid(target.getId())
+				.setTargetUid(target.getUid())
 				.setEnterSceneToken(player.getEnterSceneToken())
 				.setWorldLevel(target.getWorld().getWorldLevel())
 				.setEnterReason(reason.getValue())
@@ -66,7 +62,7 @@ public class PacketPlayerEnterSceneNotify extends GenshinPacket {
 				.addSceneTagIdList(113)
 				.addSceneTagIdList(117)
 				.setUnk1(1)
-				.setUnk2(newScene + "-" + target.getId() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
+				.setUnk2(newScene + "-" + target.getUid() + "-" + (int) (System.currentTimeMillis() / 1000) + "-" + 18402)
 				.build();
 		
 		this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java

@@ -8,12 +8,12 @@ import emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNo
 
 public class PacketPlayerGameTimeNotify extends GenshinPacket {
 	
-	public PacketPlayerGameTimeNotify(World world, GenshinPlayer player) {
+	public PacketPlayerGameTimeNotify(GenshinPlayer player) {
 		super(PacketOpcodes.PlayerGameTimeNotify);
 		
 		PlayerGameTimeNotify proto = PlayerGameTimeNotify.newBuilder()
-				.setGameTime(world.getTime())
-				.setUid(player.getId())
+				.setGameTime(player.getScene().getTime())
+				.setUid(player.getUid())
 				.build();
 		
 		this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java

 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.GenshinConstants;
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.inventory.GenshinItem;
 import emu.grasscutter.net.packet.GenshinPacket;
@@ -18,7 +19,7 @@ public class PacketPlayerStoreNotify extends GenshinPacket {
 		
 		PlayerStoreNotify.Builder p = PlayerStoreNotify.newBuilder()
 				.setStoreType(StoreType.StorePack)
-				.setWeightLimit(GenshinConstants.LIMIT_ALL);
+				.setWeightLimit(Grasscutter.getConfig().getServerOptions().InventoryLimitAll);
 		
 		for (GenshinItem item : player.getInventory()) {
 			Item itemProto = item.toProto();

src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java

@@ -21,7 +21,7 @@ public class PacketPullRecentChatRsp extends GenshinPacket {
 			ChatInfo welcomeEmote = ChatInfo.newBuilder()
 				.setTime((int) (System.currentTimeMillis() / 1000))
 				.setUid(GenshinConstants.SERVER_CONSOLE_UID)
-				.setToUid(player.getId())
+				.setToUid(player.getUid())
 				.setIcon(serverOptions.WelcomeEmotes[Utils.randomRange(0, serverOptions.WelcomeEmotes.length - 1)])
 				.build();
 			
@@ -32,7 +32,7 @@ public class PacketPullRecentChatRsp extends GenshinPacket {
 			ChatInfo welcomeMotd = ChatInfo.newBuilder()
 				.setTime((int) (System.currentTimeMillis() / 1000))
 				.setUid(GenshinConstants.SERVER_CONSOLE_UID)
-				.setToUid(player.getId())
+				.setToUid(player.getUid())
 				.setText(Grasscutter.getConfig().getServerOptions().WelcomeMotd)
 				.build();
 			

src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java

@@ -8,12 +8,12 @@ import emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeath
 
 public class PacketSceneAreaWeatherNotify extends GenshinPacket {
 	
-	public PacketSceneAreaWeatherNotify(World world, GenshinPlayer player) {
+	public PacketSceneAreaWeatherNotify(GenshinPlayer player) {
 		super(PacketOpcodes.SceneAreaWeatherNotify);
 		
 		SceneAreaWeatherNotify proto = SceneAreaWeatherNotify.newBuilder()
 				.setWeatherAreaId(1)
-				.setClimateType(world.getClimate().getValue())
+				.setClimateType(player.getScene().getClimate().getValue())
 				.build();
 		
 		this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketScenePlayerInfoNotify.java

@@ -18,10 +18,10 @@ public class PacketScenePlayerInfoNotify extends GenshinPacket {
 			GenshinPlayer p = world.getPlayers().get(i);
 
 			ScenePlayerInfo pInfo = ScenePlayerInfo.newBuilder()
-					.setUid(p.getId())
+					.setUid(p.getUid())
 					.setPeerId(p.getPeerId())
 					.setName(p.getNickname())
-					.setSceneId(world.getSceneId())
+					.setSceneId(p.getSceneId())
 					.setOnlinePlayerInfo(p.getOnlinePlayerInfo())
 					.build();
 			

src/main/java/emu/grasscutter/server/packet/send/PacketSceneTeamUpdateNotify.java

@@ -19,7 +19,7 @@ public class PacketSceneTeamUpdateNotify extends GenshinPacket {
 		for (GenshinPlayer p : player.getWorld().getPlayers()) {
 			for (EntityAvatar entityAvatar : p.getTeamManager().getActiveTeam()) {
 				SceneTeamAvatar.Builder avatarProto = SceneTeamAvatar.newBuilder()
-						.setPlayerId(p.getId())
+						.setPlayerId(p.getUid())
 						.setAvatarGuid(entityAvatar.getAvatar().getGuid())
 						.setSceneId(p.getSceneId())
 						.setEntityId(entityAvatar.getId())