Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr/427'

Browse Source
This commit is contained in:
ronancpl
2019-03-12 21:20:40 -03:00
parent 9538c415e1 0a8efa4238
commit 1383efd6c3
63 changed files with 4824 additions and 2482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/client/MapleClient.java
View File

@@ -124,6 +124,7 @@ public class MapleClient {
private int visibleWorlds;
private long lastNpcClick;
private long sessionId;
private int lingua = 0;
static {
for (int i = 0; i < 200; i++) {
@@ -269,8 +270,9 @@ public class MapleClient {
}
public boolean hasBannedHWID() {
if(hwid == null)
return false;
if(hwid == null) {
return false;
}
boolean ret = false;
PreparedStatement ps = null;
@@ -509,7 +511,9 @@ public class MapleClient {
}
public boolean checkPic(String other) {
if(!(ServerConstants.ENABLE_PIC && !canBypassPic())) return true;
if (!(ServerConstants.ENABLE_PIC && !canBypassPic())) {
return true;
}
picattempt++;
if (picattempt > 5) {
@@ -538,7 +542,7 @@ public class MapleClient {
ResultSet rs = null;
try {
con = DatabaseConnection.getConnection();
ps = con.prepareStatement("SELECT id, password, gender, banned, pin, pic, characterslots, tos FROM accounts WHERE name = ?");
ps = con.prepareStatement("SELECT id, password, gender, banned, pin, pic, characterslots, tos, lingua FROM accounts WHERE name = ?");
ps.setString(1, login);
rs = ps.executeQuery();
if (rs.next()) {
@@ -556,6 +560,7 @@ public class MapleClient {
pic = rs.getString("pic");
gender = rs.getByte("gender");
characterSlots = rs.getByte("characterslots");
lingua = rs.getInt("lingua");
String passhash = rs.getString("password");
byte tos = rs.getByte("tos");
@@ -888,6 +893,10 @@ public class MapleClient {
if (eim != null) {
eim.playerDisconnected(player);
}
if (player.getMonsterCarnival() != null) {
player.getMonsterCarnival().playerDisconnected(getPlayer().getId());
}
}
if (player.getMap() != null) {
@@ -985,7 +994,9 @@ public class MapleClient {
FilePrinter.printError(FilePrinter.ACCOUNT_STUCK, e);
} finally {
if (!this.serverTransition) {
if(chrg != null) chrg.setCharacter(null);
if(chrg != null) {
chrg.setCharacter(null);
}
wserv.removePlayer(player);
//getChannelServer().removePlayer(player); already being done
@@ -1533,4 +1544,12 @@ public class MapleClient {
public boolean canBypassPic() {
return MapleLoginBypassCoordinator.getInstance().canLoginBypass(getNibbleHWID(), accId, true);
}
}
public int getLingua() {
return lingua;
}
public void setLingua(int lingua) {
this.lingua = lingua;
}
}