Merge remote-tracking branch 'origin/dev' into dev

sqlupdates/2_2_0-RC-1_TO_2_2_0-RC-2.sql

@@ -0,0 +1 @@
+INSERT INTO `emulator_texts`(`key`, `value`) VALUES ('commands.error.cmd_badge.unknown_user', 'Failed to find the given user.');

src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java

@@ -4,6 +4,8 @@ import com.eu.habbo.Emulator;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
 import com.eu.habbo.habbohotel.users.Habbo;
+import com.eu.habbo.habbohotel.users.HabboInfo;
+import com.eu.habbo.habbohotel.users.HabboManager;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -38,11 +40,18 @@ public class BadgeCommand extends Command {
 
                 return true;
             } else {
+                HabboInfo habboInfo = HabboManager.getOfflineHabboInfo(params[1]);
+
+                if (habboInfo == null) {
+                    gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_badge.unknown_user"), RoomChatMessageBubbles.ALERT);
+                    return true;
+                }
+
                 try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) {
                     boolean found;
 
-                    try (PreparedStatement statement = connection.prepareStatement("SELECT `badge_code` FROM `users_badges` INNER JOIN `users` ON `users`.`id` = `user_id` WHERE `users`.`username` = ? AND `badge_code` = ? LIMIT 1")) {
+                    try (PreparedStatement statement = connection.prepareStatement("SELECT `badge_code` FROM `users_badges` WHERE `user_id` = ? AND `badge_code` = ? LIMIT 1")) {
-                        statement.setString(1, params[1]);
+                        statement.setInt(1, habboInfo.getId());
                         statement.setString(2, params[2]);
                         try (ResultSet set = statement.executeQuery()) {
                             found = set.next();
@@ -53,8 +62,8 @@ public class BadgeCommand extends Command {
                         gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_badge.already_owns").replace("%user%", params[1]).replace("%badge%", params[2]), RoomChatMessageBubbles.ALERT);
                         return true;
                     } else {
-                        try (PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges (`id`, `user_id`, `slot_id`, `badge_code`) VALUES (null, (SELECT `id` FROM `users` WHERE `username` = ? LIMIT 1), 0, ?)")) {
+                        try (PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges (`id`, `user_id`, `slot_id`, `badge_code`) VALUES (null, ?, 0, ?)")) {
-                            statement.setString(1, params[1]);
+                            statement.setInt(1, habboInfo.getId());
                             statement.setString(2, params[2]);
                             statement.execute();
                         }

src/main/java/com/eu/habbo/habbohotel/games/GameTeam.java

@@ -80,6 +80,14 @@ public class GameTeam {
         this.members.clear();
     }
 
+    public void resetScores() {
+        for (GamePlayer player : this.members) {
+            if (player == null) continue;
+
+            player.reset();
+        }
+    }
+
 
     public THashSet<GamePlayer> getMembers() {
         return this.members;

src/main/java/com/eu/habbo/habbohotel/games/freeze/FreezeGameTeam.java

@@ -14,7 +14,7 @@ public class FreezeGameTeam extends GameTeam {
 
     @Override
     public void removeMember(GamePlayer gamePlayer) {
-        if (gamePlayer.getHabbo() == null || gamePlayer.getHabbo().getHabboInfo().getCurrentRoom() == null) return;
+        if (gamePlayer == null || gamePlayer.getHabbo() == null || gamePlayer.getHabbo().getHabboInfo().getCurrentRoom() == null) return;
 
         Game game = gamePlayer.getHabbo().getHabboInfo().getCurrentRoom().getGame(FreezeGame.class);
         Room room = gamePlayer.getHabbo().getRoomUnit().getRoom();

src/main/java/com/eu/habbo/habbohotel/games/wired/WiredGame.java

@@ -15,6 +15,10 @@ public class WiredGame extends Game {
     @Override
     public void initialise() {
         this.state = GameState.RUNNING;
+
+        for (GameTeam team : this.teams.values()) {
+            team.resetScores();
+        }
     }
 
     @Override

src/main/java/com/eu/habbo/habbohotel/rooms/Room.java

@@ -4160,6 +4160,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
     }
 
     public void unIdle(Habbo habbo) {
+        if (habbo == null || habbo.getRoomUnit() == null) return;
         habbo.getRoomUnit().resetIdleTimer();
         this.sendComposer(new RoomUnitIdleComposer(habbo.getRoomUnit()).compose());
         WiredHandler.handle(WiredTriggerType.UNIDLES, habbo.getRoomUnit(), this, new Object[]{habbo});

src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java

@@ -22,19 +22,20 @@ public class GuildRemoveAdminEvent extends MessageHandler {
                 int userId = this.packet.readInt();
 
                 Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId());
-                Emulator.getGameEnvironment().getGuildManager().removeAdmin(guild, userId);
+                Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId);
 
-                Habbo habbo = room.getHabbo(userId);
                 GuildRemovedAdminEvent removedAdminEvent = new GuildRemovedAdminEvent(guild, userId, habbo);
                 Emulator.getPluginManager().fireEvent(removedAdminEvent);
 
                 if (removedAdminEvent.isCancelled())
                     return;
 
+                Emulator.getGameEnvironment().getGuildManager().removeAdmin(guild, userId);
+
                 if (habbo != null) {
                     habbo.getClient().sendResponse(new GuildInfoComposer(guild, this.client, false, Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild.getId(), userId)));
 
-                    room.refreshRightsForHabbo(habbo);
+                    if (room != null && habbo.getHabboInfo().getCurrentRoom() != null && habbo.getHabboInfo().getCurrentRoom() == room) room.refreshRightsForHabbo(habbo);
                 }
                 GuildMember guildMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId);