diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/database/Database.java | 10 | ||||
| -rw-r--r-- | src/main/java/pokemon/Server.java | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/database/Database.java b/src/main/java/database/Database.java index 587dc0e..a25e113 100644 --- a/src/main/java/database/Database.java +++ b/src/main/java/database/Database.java @@ -85,6 +85,7 @@ public class Database { tempUser.setId(res.getInt("id")); tempUser.setAdmin(res.getBoolean("admin")); tempUser.setUsername(user.getUsername()); + tempUser.setmonsterId(res.getLong("pokemonId")); } } } catch (SQLException e) { @@ -290,10 +291,15 @@ public class Database { PreparedStatement pre = conn.prepareStatement(sql); pre.setLong(1, id); pre.executeUpdate(); - sql="DELETE FROM monster WHERE id=?"; - pre = conn.prepareStatement(sql); + sql="DELETE FROM monster WHERE id=?"; + pre = conn.prepareStatement(sql); + pre.setLong(1, id); + pre.executeUpdate(); + sql="UPDATE user set pokemonId=null WHERE pokemonId=?"; + pre = conn.prepareStatement(sql); pre.setLong(1, id); pre.executeUpdate(); + conn.commit(); } catch (SQLException e) { diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java index 09ced57..8292281 100644 --- a/src/main/java/pokemon/Server.java +++ b/src/main/java/pokemon/Server.java @@ -172,8 +172,9 @@ public class Server implements Runnable { newUser.setPassword(msg[2].trim()); String message; User res=s.login(newUser); - if(res == null) + if(res == null ||res.monsterId==0) { + //ukoliko pogresan login ili nema izabranog pokemona message="BADLOGIN"; ByteBuffer buff = ByteBuffer.wrap(message.getBytes()); sc.write(buff); |