nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 07:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Beny 2019-05-26 17:36:33 +01:00
commit b04b93b167
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/eu/habbo/habbohotel/games/battlebanzai/BattleBanzaiGame.java
View File

@ -405,6 +405,8 @@ public class BattleBanzaiGame extends Game
public void refreshCounters(GameTeamColors teamColors) public void refreshCounters(GameTeamColors teamColors)
{ {
if (!this.teams.containsKey(teamColors)) return;
int totalScore = this.teams.get(teamColors).getTotalScore(); int totalScore = this.teams.get(teamColors).getTotalScore();
THashMap<Integer, InteractionBattleBanzaiScoreboard> scoreBoards = this.room.getRoomSpecialTypes().getBattleBanzaiScoreboards(teamColors); THashMap<Integer, InteractionBattleBanzaiScoreboard> scoreBoards = this.room.getRoomSpecialTypes().getBattleBanzaiScoreboards(teamColors);

2
src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
View File

@ -806,6 +806,8 @@ public class RoomUnit
} }
public boolean canOverrideTile(RoomTile tile) { 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; int tileIndex = (room.getLayout().getMapSizeY() * tile.y) + tile.x + 1;
return this.overridableTiles.contains(tileIndex); return this.overridableTiles.contains(tileIndex);
} }

2
src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemClothingEvent.java
View File

@ -29,7 +29,7 @@ public class RedeemClothingEvent extends MessageHandler
{ {
HabboItem item = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboItem(itemId); 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) if(item instanceof InteractionClothing)
{ {