Skip to content

Commit 98000a8

Browse files
committed
enhance(server): boolean paused property parsing
1 parent 99521ff commit 98000a8

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.dev/githooks/commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ scopes_file=".dev/scopes.txt"
55
test -r $scopes_file &&
66
scopes="($(cat "$scopes_file" | sed '/^\(#.*\|\)$/d' | sed ':a;N;s/\n/|/g;ta'))"
77

8-
head -1 "$1" | grep -Eq "^(fix|feat|docs|style|refactor|test|build|rework|release|revert)(\(${scopes:-.*}(/.+)?\))?: [A-Za-z]"
8+
head -1 "$1" | grep -Eq "^(fix|feat|enhance|docs|style|refactor|test|build|rework|release|revert)(\(${scopes:-.*}(/.+)?\))?: [A-Za-z]"
99
result=$?
1010
if test $result -ne 0
1111
then printf "Invalid commit message: '$(head -1 "$1")'

.dev/githooks/prepare-commit-msg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ then
3939
printf "feat(dev): "
4040
# Example for gradle projects
4141
expr "$path" : "gradle" \| "$path" : "build" >/dev/null &&
42-
printf "chore(gradle): "
42+
printf "build(gradle): "
4343

4444
printf "\n\n# Please enter the message in the format\n"
4545
echo "# <type>(<scope>): <description>"
46-
echo "# Possible types: fix, feat, docs, style, refactor, test, build"
46+
echo "# Possible types: fix, feat, enhance, docs, style, refactor, test, build"
4747
test -n "$scopes" && echo "# Allowed scopes: $scopes"
4848
echo "# For details see https://www.notion.so/softwarechallenge/Git-217333329ea64db5b2cc8bbbaf79db87"
4949
echo "$original"

server/src/main/java/sc/server/Configuration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public static void loadServerProperties() {
4848
} else {
4949
logger.warn("Could not find server.properties at {}, will use default values!", file);
5050
}
51+
// Defaults, only if server.properties cannot be loaded
5152
properties.setProperty(PASSWORD_KEY, "examplepassword");
52-
properties.setProperty(PAUSED, "false");
5353
}
5454

5555
public static void load(Reader reader) throws IOException {
@@ -113,12 +113,12 @@ public static <T> T get(String key, Class<T> type, T defaultValue) {
113113
}
114114

115115
private static boolean toBoolean(String value) {
116-
if ("true".equals(value)) {
116+
if ("true".equalsIgnoreCase(value)) {
117117
return true;
118-
} else if ("false".equals(value)) {
118+
} else if ("false".equalsIgnoreCase(value)) {
119119
return false;
120120
} else {
121-
throw new IllegalArgumentException("Argument must be true or false");
121+
throw new IllegalArgumentException("Argument '" + value + "' should be true or false");
122122
}
123123
}
124124

server/src/main/java/sc/server/gaming/GameRoomManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public GameRoom createGameRoom(IGameInstance game, boolean prepared) {
7373
GameRoom room = new GameRoom(generateRoomId(), this, game);
7474
// pause room on JoinRoomRequest if specified in server.properties
7575
if (!prepared) {
76-
boolean paused = Boolean.parseBoolean(Configuration.get(Configuration.PAUSED));
76+
boolean paused = Configuration.get(Configuration.PAUSED, Boolean.class, false);
7777
room.pause(paused);
7878
}
7979

0 commit comments

Comments
 (0)