refactor: changed returnType of checkRequestAndApply to optional
This commit is contained in:
parent
842db2439a
commit
141469c11f
@ -8,6 +8,7 @@ import uulm.teamname.marvelous.gamelibrary.json.config.ScenarioConfig;
|
||||
import uulm.teamname.marvelous.gamelibrary.requests.Request;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Optional;
|
||||
|
||||
/** Represents a game instance. */
|
||||
public class GameInstance {
|
||||
@ -32,14 +33,14 @@ public class GameInstance {
|
||||
* @param requests The requests to check
|
||||
* @return The list of resulting {@link Event}s or `null` if the check failed
|
||||
*/
|
||||
public ArrayList<Event> checkRequestsAndApply(Request... requests) {
|
||||
public Optional<ArrayList<Event>> checkRequestsAndApply(Request... requests) {
|
||||
if(manager.processRequests(requests, true)) {
|
||||
ArrayList<Event> result = manager.apply();
|
||||
result.addAll(manager.checkPostPhase());
|
||||
return result;
|
||||
return Optional.of(result);
|
||||
}
|
||||
|
||||
return null;
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user