Skip to content

Commit 03875c5

Browse files
committed
Version 1.1.2
1 parent 6afcbc1 commit 03875c5

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

dependency-reduced-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.frosthex</groupId>
55
<artifactId>timingsystem.restapi</artifactId>
66
<name>timingsystem.restapi</name>
7-
<version>1.1</version>
7+
<version>1.1.2</version>
88
<url>http://maven.apache.org</url>
99
<build>
1010
<sourceDirectory>src</sourceDirectory>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.frosthex</groupId>
55
<artifactId>timingsystem.restapi</artifactId>
6-
<version>1.1.1</version>
6+
<version>1.1.2</version>
77
<packaging>jar</packaging>
88
<name>timingsystem.restapi</name>
99
<url>http://maven.apache.org</url>

src/com/frosthex/timingsystem/restapi/network/SparkManager.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,13 @@ public static void initSpark() {
214214
responseObject.addProperty("total_finishes", track.getTimeTrials().getTotalFinishes());
215215
responseObject.addProperty("total_time_spent", track.getTotalTimeSpent());
216216
responseObject.addProperty("weight", track.getWeight());
217-
responseObject.addProperty("gui_item", track.getItem().toString());
217+
ItemStack trackItem = track.getItem();
218+
if (trackItem == null) {
219+
Messager.msgConsole("&c[WARN] Track " + track.getCommandName() + " has a TrackItem that is null.");
220+
responseObject.addProperty("gui_item", "null");
221+
} else {
222+
responseObject.addProperty("gui_item", track.getItem().toString());
223+
}
218224
JsonArray optionsArray = new JsonArray();
219225
for (TrackOption option : track.getTrackOptions().getTrackOptions()) {
220226
optionsArray.add(option.toString());
@@ -268,7 +274,13 @@ public static void initSpark() {
268274
responseObject.addProperty("total_finishes", track.getTimeTrials().getTotalFinishes());
269275
responseObject.addProperty("total_time_spent", track.getTotalTimeSpent());
270276
responseObject.addProperty("weight", track.getWeight());
271-
responseObject.addProperty("gui_item", track.getItem().toString());
277+
ItemStack trackItem = track.getItem();
278+
if (trackItem == null) {
279+
Messager.msgConsole("&c[WARN] Track " + track.getCommandName() + " has a TrackItem that is null.");
280+
responseObject.addProperty("gui_item", "null");
281+
} else {
282+
responseObject.addProperty("gui_item", track.getItem().toString());
283+
}
272284
JsonArray optionsArray = new JsonArray();
273285
for (TrackOption option : track.getTrackOptions().getTrackOptions()) {
274286
optionsArray.add(option.toString());

src/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: TimingSystemRESTApi
2-
version: 1.11
2+
version: 1.1.2
33
authors: [Justin Brubaker (JustBru00)]
44
softdepend: [TimingSystem]
55
main: com.frosthex.timingsystem.restapi.TimingSystemRESTApiPlugin

0 commit comments

Comments
 (0)