Skip to content

Commit 47202df

Browse files
andrei1058andrei1058
committed
added more npe checks
1 parent 50579ac commit 47202df

3 files changed

Lines changed: 20 additions & 2 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ image: "maven:latest"
77

88
maven-job:
99
script:
10-
- 'mvn -DbuildNumber=$CI_PIPELINE_ID clean install -s ci_settings.xml'
10+
- 'mvn -DgitVer=git-$CI_COMMIT_SHORT_SHA- clean install -s ci_settings.xml'
1111
artifacts:
1212
paths:
1313
- 'target/*.jar'

‎src/main/java/com/andrei1058/bedwars/proxy/socketmanager/ArenaSocketTask.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,32 @@ public void run() {
5252
if (!json.has("type")) continue;
5353
switch (json.get("type").getAsString()) {
5454
case "RC":
55+
if (!json.has("server")) break;
56+
if (!json.has("arena_id")) break;
57+
if (!json.has("uuid")) break;
5558
CachedArena arena = ArenaManager.getInstance().getArena(json.get("server").getAsString(), json.get("arena_id").getAsString());
5659
if (arena == null) continue;
5760
RemoteReJoin rrj2 = RemoteReJoin.getReJoin(UUID.fromString(json.get("uuid").getAsString()));
5861
if (rrj2 != null) rrj2.destroy();
5962
new RemoteReJoin(UUID.fromString(json.get("uuid").getAsString()), arena);
6063
break;
6164
case "RD":
65+
if (!json.has("server")) break;
66+
if (!json.has("uuid")) break;
6267
RemoteReJoin rrj = RemoteReJoin.getReJoin(UUID.fromString(json.get("uuid").getAsString()));
6368
if (rrj == null) continue;
6469
if (rrj.getArena().getServer().equals(json.get("server").getAsString())) rrj.destroy();
6570
break;
6671
case "UPDATE":
72+
if (!json.has("server_name")) break;
73+
if (!json.has("arena_identifier")) break;
74+
if (!json.has("arena_max_players")) break;
75+
if (!json.has("arena_current_players")) break;
76+
if (!json.has("arena_status")) break;
77+
if (!json.has("server_name")) break;
78+
if (!json.has("arena_group")) break;
79+
if (!json.has("arena_current_players")) break;
80+
if (!json.has("arena_max_in_team")) break;
6781
//update,serverName,remoteIdentifier,arenaName,group,status,maxP,currP,maxInTeam (for parties)
6882
CachedArena ca = ArenaManager.getInstance().getArena(json.get("server_name").getAsString(), json.get("arena_identifier").getAsString());
6983
if (ca != null) {
@@ -105,6 +119,10 @@ public void run() {
105119
});
106120
break;
107121
case "Q":
122+
if (!json.has("requester")) break;
123+
if (!json.has("name")) break;
124+
if (!json.has("server_name")) break;
125+
if (!json.has("arena_id")) break;
108126
TpRequest tr = TpRequest.getTpRequest(UUID.fromString(json.get("requester").getAsString()));
109127
if (tr != null && tr.getTarget().equalsIgnoreCase(json.get("name").getAsString())){
110128
CachedArena ar = ArenaManager.getInstance().getArena(json.get("server_name").getAsString(),

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: BedWarsProxy
2-
version: '20.1-b1'
2+
version: ${gitVer}${project.version}
33
description: Arena connecter for BedWars1058
44
main: com.andrei1058.bedwars.proxy.BedWarsProxy
55
author: andrei1058

0 commit comments

Comments
 (0)