Skip to content

Commit ab8e554

Browse files
committed
Fixed NullPointerException in case of missing config strings
1 parent 50e748a commit ab8e554

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

src/main/java/com/selfcoders/matterbukkit/EventListener.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@ public void onPlayerDeath(PlayerDeathEvent event) {
5353

5454
Player player = event.getEntity();
5555

56-
text = text.replaceAll("%playername%", player.getName())
57-
.replaceAll("%username%", player.getName())
58-
.replaceAll("%death-message%", event.getDeathMessage());
56+
String deathMessage = event.getDeathMessage();
57+
if (deathMessage == null) {
58+
deathMessage = player.getName() + " died";
59+
}
5960

60-
try {
61-
matterBridgeApi.sendMessage(text);
62-
} catch (IOException exception) {
63-
plugin.getLogger().log(Level.SEVERE, exception.toString(), exception);
61+
if (text == null) {
62+
text = deathMessage;
63+
} else {
64+
text = text.replaceAll("%playername%", player.getName())
65+
.replaceAll("%username%", player.getName())
66+
.replaceAll("%death-message%", deathMessage);
6467
}
6568

6669
apiClient.sendMessage(text);
@@ -85,6 +88,9 @@ public void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) {
8588
}
8689

8790
String text = config.getString("outgoing.advancement.format");
91+
if (text == null) {
92+
text = "%playername% has made the advancement [%advancement%]";
93+
}
8894

8995
text = text.replaceAll("%playername%", event.getPlayer().getName())
9096
.replaceAll("%advancement%", advancementDisplay.getTitle());
@@ -117,6 +123,9 @@ public void onPlayerLevelChange(PlayerLevelChangeEvent event) {
117123
}
118124

119125
String text = config.getString("outgoing.level-up.format");
126+
if (text == null) {
127+
text = "%playername% reached level %new-level%";
128+
}
120129

121130
text = text.replaceAll("%playername%", event.getPlayer().getName())
122131
.replaceAll("%old-level%", String.valueOf(oldLevel))

0 commit comments

Comments
 (0)