diff --git a/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java b/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java index b59e0be7..4d4c57e5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java @@ -405,6 +405,8 @@ public class BattleBanzaiGame extends Game public void refreshCounters(GameTeamColors teamColors) { + if (!this.teams.containsKey(teamColors)) return; + int totalScore = this.teams.get(teamColors).getTotalScore(); THashMap scoreBoards = this.room.getRoomSpecialTypes().getBattleBanzaiScoreboards(teamColors); diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java index 5fea11e4..f6afd05c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java @@ -806,6 +806,8 @@ public class RoomUnit } public boolean canOverrideTile(RoomTile tile) { + if (tile == null || room == null || room.getLayout() == null) return false; + int tileIndex = (room.getLayout().getMapSizeY() * tile.y) + tile.x + 1; return this.overridableTiles.contains(tileIndex); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java index 612360cf..99c40950 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java @@ -29,7 +29,7 @@ public class RedeemClothingEvent extends MessageHandler { HabboItem item = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboItem(itemId); - if(item.getUserId() == this.client.getHabbo().getHabboInfo().getId()) + if(item != null && item.getUserId() == this.client.getHabbo().getHabboInfo().getId()) { if(item instanceof InteractionClothing) {