Yandrik/Gamelib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: changed event types to non-primitives for nullability

Browse Source
This commit is contained in:
Yannik Bretschneider
2021-05-02 03:15:20 +02:00
parent e6cc61a272
commit 326c469e55
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/uulm/teamname/marvelous/gamelibrary/events/GameEvent.java
View File

@ -9,15 +9,15 @@ import java.util.Objects;
/** Represents a game event for: {@link EventType#RoundSetupEvent}, {@link EventType#TurnEvent}, {@link EventType#WinEvent}, {@link EventType#TurnTimeoutEvent}, {@link EventType#TimeoutWarningEvent}, {@link EventType#TimeoutEvent}, {@link EventType#DisconnectEvent}. */
public class GameEvent extends Event {
public int roundCount;
public int turnCount;
public Integer roundCount;
public Integer turnCount;
public EntityID[] characterOrder;
public EntityID nextCharacter;
public int playerWon;
public Integer playerWon;
public String message;
public int timeLeft;
public Integer timeLeft;
@Override
public boolean equals(Object o) {
@ -25,7 +25,7 @@ public class GameEvent extends Event {
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
GameEvent gameEvent = (GameEvent) o;
return roundCount == gameEvent.roundCount && turnCount == gameEvent.turnCount && playerWon == gameEvent.playerWon && timeLeft == gameEvent.timeLeft && Arrays.equals(characterOrder, gameEvent.characterOrder) && Objects.equals(nextCharacter, gameEvent.nextCharacter) && Objects.equals(message, gameEvent.message);
return Objects.equals(roundCount, gameEvent.roundCount) && Objects.equals(turnCount, gameEvent.turnCount) && Objects.equals(playerWon, gameEvent.playerWon) && Objects.equals(timeLeft, gameEvent.timeLeft) && Arrays.equals(characterOrder, gameEvent.characterOrder) && Objects.equals(nextCharacter, gameEvent.nextCharacter) && Objects.equals(message, gameEvent.message);
}
@Override

2
src/main/java/uulm/teamname/marvelous/gamelibrary/events/GameStateEvent.java
View File

@ -11,7 +11,7 @@ public class GameStateEvent extends Event {
public Entity[] entities;
public EntityID[] turnOrder;
public EntityID activeCharacter;
public boolean winCondition;
public Boolean winCondition;
@Override
public boolean equals(Object o) {