Skip to content

Commit bba0fb9

Browse files
Check for null lamp material strings
1 parent 0422b76 commit bba0fb9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/me/eccentric_nz/TARDIS/database/resultset/ResultSetLamps.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ public boolean resultSet() {
102102
if (loc != null) {
103103
String materialOnStr = rs.getString("material_on");
104104
Material materialOn = null;
105-
if (!materialOnStr.isEmpty()) {
105+
if (materialOnStr != null && !materialOnStr.isEmpty()) {
106106
try {
107107
materialOn = Material.valueOf(materialOnStr);
108108
} catch (IllegalArgumentException ignored) {
109109
}
110110
}
111111
String materialOffStr = rs.getString("material_off");
112112
Material materialOff = null;
113-
if (!materialOffStr.isEmpty()) {
113+
if (materialOffStr != null && !materialOffStr.isEmpty()) {
114114
try {
115115
materialOff = Material.valueOf(materialOffStr);
116116
} catch (IllegalArgumentException ignored) {

0 commit comments

Comments
 (0)