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

Fix ConcurrentModificationException in BB tile filling

Browse Source
This commit is contained in:
Alejandro 2019-05-18 21:21:27 +03:00
parent 64c62b92cb
commit 775d429833
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import com.eu.habbo.habbohotel.wired.WiredHandler;
import com.eu.habbo.habbohotel.wired.WiredTriggerType; import com.eu.habbo.habbohotel.wired.WiredTriggerType;
import com.eu.habbo.messages.outgoing.rooms.users.RoomUserActionComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserActionComposer;
import com.eu.habbo.threading.runnables.BattleBanzaiTilesFlicker; import com.eu.habbo.threading.runnables.BattleBanzaiTilesFlicker;
import gnu.trove.impl.hash.THash;
import gnu.trove.map.hash.THashMap; import gnu.trove.map.hash.THashMap;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
@ -295,10 +296,11 @@ public class BattleBanzaiGame extends Game
int y = item.getY(); int y = item.getY();
List<List<RoomTile>> filledAreas = new ArrayList<>(); List<List<RoomTile>> filledAreas = new ArrayList<>();
filledAreas.add(this.floodFill(x, y - 1, this.lockedTiles.get(teamColor), new ArrayList<>(), teamColor)); THashSet<HabboItem> lockedTiles = new THashSet<>(this.lockedTiles.get(teamColor));
filledAreas.add(this.floodFill(x, y + 1, this.lockedTiles.get(teamColor), new ArrayList<>(), teamColor)); filledAreas.add(this.floodFill(x, y - 1, lockedTiles, new ArrayList<>(), teamColor));
filledAreas.add(this.floodFill(x - 1, y, this.lockedTiles.get(teamColor), new ArrayList<>(), teamColor)); filledAreas.add(this.floodFill(x, y + 1, lockedTiles, new ArrayList<>(), teamColor));
filledAreas.add(this.floodFill(x + 1, y, this.lockedTiles.get(teamColor), new ArrayList<>(), teamColor)); filledAreas.add(this.floodFill(x - 1, y, lockedTiles, new ArrayList<>(), teamColor));
filledAreas.add(this.floodFill(x + 1, y, lockedTiles, new ArrayList<>(), teamColor));
Optional<List<RoomTile>> largestAreaOfAll = filledAreas.stream().filter(Objects::nonNull).max(Comparator.comparing(List::size)); Optional<List<RoomTile>> largestAreaOfAll = filledAreas.stream().filter(Objects::nonNull).max(Comparator.comparing(List::size));
@ -335,10 +337,10 @@ public class BattleBanzaiGame extends Game
stack.add(tile); stack.add(tile);
List<List<RoomTile>> result = new ArrayList<>(); List<List<RoomTile>> result = new ArrayList<>();
result.add(this.floodFill(x, y - 1, lockedTiles, stack, color)); result.add(this.floodFill(x, y - 1, new THashSet<>(lockedTiles), stack, color));
result.add(this.floodFill(x, y + 1, lockedTiles, stack, color)); result.add(this.floodFill(x, y + 1, new THashSet<>(lockedTiles), stack, color));
result.add(this.floodFill(x - 1, y, lockedTiles, stack, color)); result.add(this.floodFill(x - 1, y, new THashSet<>(lockedTiles), stack, color));
result.add(this.floodFill(x + 1, y, lockedTiles, stack, color)); result.add(this.floodFill(x + 1, y, new THashSet<>(lockedTiles), stack, color));
if (result.contains(null)) return null; if (result.contains(null)) return null;
@ -350,7 +352,7 @@ public class BattleBanzaiGame extends Game
private boolean hasLockedTileAtCoordinates(int x, int y, THashSet<HabboItem> lockedTiles) private boolean hasLockedTileAtCoordinates(int x, int y, THashSet<HabboItem> lockedTiles)
{ {
for (HabboItem item: lockedTiles) for (HabboItem item : lockedTiles)
{ {
if (item.getX() == x && item.getY() == y) return true; if (item.getX() == x && item.getY() == y) return true;
} }
@ -360,7 +362,7 @@ public class BattleBanzaiGame extends Game
private boolean isOutOfBounds(int x, int y) private boolean isOutOfBounds(int x, int y)
{ {
for (HabboItem item: this.gameTiles.values()) for (HabboItem item : this.gameTiles.values())
{ {
if (item.getX() == x && item.getY() == y) return false; if (item.getX() == x && item.getY() == y) return false;
} }