From b1ffe58c1a0065d8aa05bba5ea06473f5692fa6c Mon Sep 17 00:00:00 2001 From: Lossy Date: Sat, 15 Jan 2022 05:19:46 -0600 Subject: [PATCH] SteamConfiguration.getCellID() is not used in login --- .../handlers/steamuser/AnonymousLogOnDetails.java | 4 ++-- .../steam/handlers/steamuser/LogOnDetails.java | 4 ++-- .../steam/handlers/steamuser/SteamUser.java | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/AnonymousLogOnDetails.java b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/AnonymousLogOnDetails.java index 71b97c14..96e30c92 100644 --- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/AnonymousLogOnDetails.java +++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/AnonymousLogOnDetails.java @@ -8,7 +8,7 @@ */ public class AnonymousLogOnDetails { - private int cellID; + private Integer cellID; private EOSType clientOSType; @@ -24,7 +24,7 @@ public AnonymousLogOnDetails() { * * @return the CellID. */ - public int getCellID() { + public Integer getCellID() { return cellID; } diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/LogOnDetails.java b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/LogOnDetails.java index 801b21ef..ed860817 100644 --- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/LogOnDetails.java +++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/LogOnDetails.java @@ -14,7 +14,7 @@ public class LogOnDetails { private String password = ""; - private int cellID; + private Integer cellID; private Integer loginID; @@ -87,7 +87,7 @@ public void setPassword(String password) { * * @return the CellID. */ - public int getCellID() { + public Integer getCellID() { return cellID; } diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.java b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.java index 53d84b44..2900e6d8 100644 --- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.java +++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamuser/SteamUser.java @@ -163,7 +163,12 @@ public void logOn(LogOnDetails details) { logon.getBody().setProtocolVersion(MsgClientLogon.CurrentProtocol); logon.getBody().setClientOsType(details.getClientOSType().code()); logon.getBody().setClientLanguage(details.getClientLanguage()); - logon.getBody().setCellId(details.getCellID()); + + if (details.getCellID() != null) { + logon.getBody().setCellId(details.getCellID()); + } else { + logon.getBody().setCellId(client.getConfiguration().getCellID()); + } logon.getBody().setSteam2TicketRequest(details.isRequestSteam2Ticket()); @@ -229,7 +234,12 @@ public void logOnAnonymous(AnonymousLogOnDetails details) { logon.getBody().setProtocolVersion(MsgClientLogon.CurrentProtocol); logon.getBody().setClientOsType(details.getClientOSType().code()); logon.getBody().setClientLanguage(details.getClientLanguage()); - logon.getBody().setCellId(details.getCellID()); + + if (details.getCellID() != null) { + logon.getBody().setCellId(details.getCellID()); + } else { + logon.getBody().setCellId(client.getConfiguration().getCellID()); + } logon.getBody().setMachineId(ByteString.copyFrom(HardwareUtils.getMachineID()));