Merge pull request #55 from memetrollsXD/development

Custom Y position on MarkMapReq

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

@@ -16,6 +16,18 @@ import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
 @Opcodes(PacketOpcodes.MarkMapReq)
 public class HandlerMarkMapReq extends PacketHandler {
 
+	private static boolean isInt(String str) {
+
+		try {
+			@SuppressWarnings("unused")
+			int x = Integer.parseInt(str);
+			return true; // String is an Integer
+		} catch (NumberFormatException e) {
+			return false; // String is not an Integer
+		}
+
+	}
+
 	@Override
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		MarkMapReq req = MarkMapReq.parseFrom(payload);
@@ -26,15 +38,18 @@ public class HandlerMarkMapReq extends PacketHandler {
 
 		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().getUid() + ":" + session.getPlayer().getNickname() + "] tp to " + session.getPlayer().getPos() + " Scene id: " + req.getMark().getSceneId());
+		session.getPlayer().getPos()
+				.setY(isInt(req.getMark().getName()) ? Integer.parseInt(req.getMark().getName()) : 300);
+
+		Grasscutter.getLogger().info("Player [" + session.getPlayer().getUid() + ":" + session.getPlayer().getNickname()
+				+ "] tp to " + session.getPlayer().getPos() + " Scene id: " + req.getMark().getSceneId());
 
 		if (req.getMark().getSceneId() != session.getPlayer().getSceneId()) {
-			session.getPlayer().getWorld().transferPlayerToScene(session.getPlayer(), req.getMark().getSceneId(), session.getPlayer().getPos());
+			session.getPlayer().getWorld().transferPlayerToScene(session.getPlayer(), req.getMark().getSceneId(),
+					session.getPlayer().getPos());
 		} else {
 			session.getPlayer().getScene().broadcastPacket(new PacketSceneEntityAppearNotify(session.getPlayer()));
 		}
 	}
-
 }