mirrors/Havana
1
Fork 0
mirror of https://github.com/Quackster/Havana.git synced 2025-07-02 20:57:47 +00:00
Code Activity

Make game scores on BattleBall and SnowStorm thread-safe

Browse source
This commit is contained in:
Quackster 2023-07-29 12:07:06 +10:00
parent cf5d1b61c7
commit e790ba6f25
9 changed files with 56 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Havana-Server/src/main/java/org/alexdev/havana/game/games/Game.java
View file

@ -260,9 +260,11 @@ public abstract class Game {
var gameHistoryData = new GameHistoryData();
var gameHistory = new GameHistory(gameHistoryData);
this.teams.values().forEach(GameTeam::calculateScore);
if (this.teams.size() > 0) {
var sortedTeamList = new ArrayList<>(this.teams.values());
sortedTeamList.sort(Comparator.comparingInt(GameTeam::getScore).reversed());
List<GameTeam> sortedTeamList = new ArrayList<>(this.teams.values());
sortedTeamList.sort(Comparator.comparingInt(GameTeam::getPoints).reversed());
var winningTeam = sortedTeamList.get(0);
@ -270,13 +272,14 @@ public abstract class Game {
for (GameTeam team : sortedTeamList) {
for (GamePlayer gamePlayer : team.getPlayers()) {
gamePlayer.calculateScore();
gameHistoryData.addPlayer(gamePlayer.getUserId(), gamePlayer.getScore(), gamePlayer.getTeamId());
}
}
gameHistory.setName(this.getName());
gameHistory.setWinningTeam(winningTeam.getId());
gameHistory.setWinningTeamScore(winningTeam.getScore());
gameHistory.setWinningTeamScore(winningTeam.getPoints());
gameHistory.setGameType(this.gameType);
gameHistory.setMapId(this.getMapId());
@ -769,9 +772,9 @@ public abstract class Game {
* Method called when the game initially began
*/
public void gamePrepare() {
for (GameTeam gameTeam : this.getTeams().values()) {
gameTeam.setScore(0);
}
// for (GameTeam gameTeam : this.getTeams().values()) {
// gameTeam.setScore(0);
// }
for (GamePlayer gamePlayer : this.getActivePlayers()) {
gamePlayer.setXp(0);

2
Havana-Server/src/main/java/org/alexdev/havana/game/games/battleball/BattleBallTask.java
View file

@ -10,6 +10,7 @@ import org.alexdev.havana.game.games.battleball.objects.PlayerUpdateObject;
import org.alexdev.havana.game.games.battleball.objects.PowerUpUpdateObject;
import org.alexdev.havana.game.games.enums.GameState;
import org.alexdev.havana.game.games.player.GamePlayer;
import org.alexdev.havana.game.games.player.GameTeam;
import org.alexdev.havana.game.pathfinder.Position;
import org.alexdev.havana.game.pathfinder.Rotation;
import org.alexdev.havana.game.player.Player;
@ -50,6 +51,7 @@ public class BattleBallTask implements Runnable {
this.game.getObjectsQueue().drainTo(objects);
this.game.getUpdateTilesQueue().drainTo(updateTiles);
this.game.getFillTilesQueue().drainTo(fillTiles);
this.game.getTeams().values().forEach(GameTeam::calculateScore);
for (GamePlayer gamePlayer : this.game.getActivePlayers()) {
Player player = gamePlayer.getPlayer();

22
Havana-Server/src/main/java/org/alexdev/havana/game/games/player/GamePlayer.java
View file

@ -11,6 +11,8 @@ import org.alexdev.havana.game.pathfinder.Position;
import org.alexdev.havana.game.player.Player;
import org.alexdev.havana.game.games.snowstorm.util.SnowStormAttributes;
import java.util.concurrent.atomic.AtomicInteger;
public class GamePlayer {
private Player player;
private GameObject gameObject;
@ -27,7 +29,7 @@ public class GamePlayer {
private GamePlayer harlequinPlayer;
private boolean assignedSpawn;
private int score;
private AtomicInteger score;
private int xp;
private SnowStormAttributes snowStormAttributes;
@ -42,7 +44,7 @@ public class GamePlayer {
this.enteringGame = false;
this.clickedRestart = false;
this.position = new Position();
this.score = 0;
this.score = new AtomicInteger(0);
this.xp = 0;
this.snowStormAttributes = new SnowStormAttributes();
}
@ -53,7 +55,7 @@ public class GamePlayer {
* @param score the score
*/
public void setScore(int score) {
this.score = score;
this.score.set(score);
}
/**
@ -61,13 +63,15 @@ public class GamePlayer {
*
* @return the score
*/
public int getScore() {
public void calculateScore() {
if (!this.inGame) {
return 0;
this.score.set(0);
return;
}
if (this.getGame() instanceof BattleBallGame) {
this.score = 0;
this.score.set(0);
BattleBallGame battleBallGame = (BattleBallGame) this.getGame();
for (BattleBallTile battleBallTile : battleBallGame.getTiles()) {
@ -76,12 +80,14 @@ public class GamePlayer {
continue;
}
this.score += scoreReference.getScore();
this.score.addAndGet(scoreReference.getScore());
}
}
}
}
return this.score;
public int getScore() {
return score.get();
}
/**

32
Havana-Server/src/main/java/org/alexdev/havana/game/games/player/GameTeam.java
View file

@ -7,19 +7,22 @@ import org.alexdev.havana.game.games.utils.ScoreReference;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
public class GameTeam {
private int id;
private Game game;
private List<GamePlayer> playerList;
private int score;
public AtomicInteger points;
public AtomicInteger snowstormPoints;
public GameTeam(int id, Game game) {
this.id = id;
this.game = game;
this.playerList = new CopyOnWriteArrayList<>();
this.score = 0;
this.points = new AtomicInteger(0);
}
public int getId() {
@ -30,10 +33,10 @@ public class GameTeam {
return playerList;
}
public int getScore() {
if (this.game instanceof BattleBallGame) {
this.score = 0;
public void calculateScore() {
this.points.set(0);
if (this.game instanceof BattleBallGame) {
BattleBallGame battleBallGame = (BattleBallGame) this.game;
for (BattleBallTile battleBallTile : battleBallGame.getTiles()) {
@ -42,18 +45,27 @@ public class GameTeam {
continue;
}
this.score += scoreReference.getScore();
this.points.addAndGet(scoreReference.getScore());
}
}
}
return this.score;
else {
this.points.set(0);
int totalScore = this.playerList.stream()
.mapToInt(player -> player.getScore())
.sum();
this.points.addAndGet(totalScore);
}
}
public void setScore(int score) {
this.score = score;
public int getPoints() {
return points.get();
}
public List<GamePlayer> getActivePlayers() {
return playerList.stream().filter(GamePlayer::isInGame).collect(Collectors.toList());
}

3
Havana-Server/src/main/java/org/alexdev/havana/game/games/snowstorm/SnowStormGame.java
View file

@ -116,7 +116,8 @@ public class SnowStormGame extends Game {
}
for (GameTeam team : this.getTeams().values()) {
team.setScore(team.getPlayers().stream().mapToInt(GamePlayer::getScore).sum());
team.calculateScore();
// team.setScore(team.getPlayers().stream().mapToInt(GamePlayer::getScore).sum());
}
super.finishGame();

8
Havana-Server/src/main/java/org/alexdev/havana/game/games/tasks/GameFinishTask.java
View file

@ -24,12 +24,12 @@ import java.util.UUID;
public class GameFinishTask implements Runnable {
private final List<GamePlayer> players;
private final ArrayList<GameTeam> sortedTeamList;
private final List<GameTeam> sortedTeamList;
private final GameType gameType;
private final Game game;
private final GameHistory gameHistory;
public GameFinishTask(Game game, GameHistory gameHistory, GameType gameType, ArrayList<GameTeam> sortedTeamList, List<GamePlayer> players) {
public GameFinishTask(Game game, GameHistory gameHistory, GameType gameType, List<GameTeam> sortedTeamList, List<GamePlayer> players) {
this.game = game;
this.gameHistory = gameHistory;
this.gameType = gameType;
@ -58,8 +58,8 @@ public class GameFinishTask implements Runnable {
if (this.game.canIncreasePoints()) {
if ((this.sortedTeamList.size() == 1 && this.sortedTeamList.get(0).getPlayers().size() > 1) || (this.sortedTeamList.size() > 1
&& this.sortedTeamList.get(0).getScore() > 0
&& this.sortedTeamList.get(0).getScore() != this.sortedTeamList.get(1).getScore()) &&
&& this.sortedTeamList.get(0).getPoints() > 0
&& this.sortedTeamList.get(0).getPoints() != this.sortedTeamList.get(1).getPoints()) &&
this.sortedTeamList.get(0).getPlayers().size() > 0 &&
this.sortedTeamList.get(1).getPlayers().size() > 0) {

2
Havana-Server/src/main/java/org/alexdev/havana/game/games/utils/FinishedGame.java
View file

@ -81,7 +81,7 @@ public class FinishedGame {
private List<Pair<String, Integer>> playerScores;
private FinishedGameTeam(GameTeam gameTeam) {
this.score = gameTeam.getScore();
this.score = gameTeam.getPoints();
this.playerScores = new ArrayList<>();
for (var gamePlayer : gameTeam.getPlayers()) {

2
Havana-Server/src/main/java/org/alexdev/havana/messages/outgoing/games/GAMEEND.java
View file

@ -34,7 +34,7 @@ public class GAMEEND extends MessageComposer {
response.writeInt(gamePlayer.getScore());
}
response.writeInt(team.getScore());
response.writeInt(team.getPoints());
}
}
}

2
Havana-Server/src/main/java/org/alexdev/havana/messages/outgoing/games/GAMESTATUS.java
View file

@ -83,7 +83,7 @@ public class GAMESTATUS extends MessageComposer {
response.writeInt(this.gameTeams.size());
for (GameTeam team : this.gameTeams) {
response.writeInt(team.getScore());
response.writeInt(team.getPoints());
}
response.writeInt(1);