Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
public class AnonymousLogOnDetails {

private int cellID;
private Integer cellID;

private EOSType clientOSType;

Expand All @@ -24,7 +24,7 @@ public AnonymousLogOnDetails() {
*
* @return the CellID.
*/
public int getCellID() {
public Integer getCellID() {
return cellID;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class LogOnDetails {

private String password = "";

private int cellID;
private Integer cellID;

private Integer loginID;

Expand Down Expand Up @@ -87,7 +87,7 @@ public void setPassword(String password) {
*
* @return the CellID.
*/
public int getCellID() {
public Integer getCellID() {
return cellID;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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()));

Expand Down