Skip to content

Commit baf6d92

Browse files
committed
Fix NPE when DC is disabled
1 parent 84c39ab commit baf6d92

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mod_version = 1.2.0
1+
mod_version = 1.2.1
22
group = net.shadowfacts
33
archivesBaseName = DiscordChat
44

src/main/java/net/shadowfacts/discordchat/DiscordChat.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
public class DiscordChat {
1818

1919
public static final String modId = "DiscordChat";
20-
public static final String version = "1.2.0";
20+
public static final String version = "1.2.1";
2121

2222
public static Logger log = LogManager.getLogger(modId);
2323

src/main/java/net/shadowfacts/discordchat/ForgeEventHandler.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void serverChat(ServerChatEvent event) {
2424

2525
@SubscribeEvent
2626
public void onPlayerDeath(LivingDeathEvent event) {
27-
if (DCConfig.sendPlayerDeathMessages) {
27+
if (DCConfig.enabled && DCConfig.sendPlayerDeathMessages) {
2828
if (event.getEntityLiving() instanceof EntityPlayer) {
2929
DiscordThread.instance.sendMessageToAllChannels(MiscUtils.createDiscordDeathMessage((EntityPlayer)event.getEntityLiving()));
3030
}
@@ -33,7 +33,7 @@ public void onPlayerDeath(LivingDeathEvent event) {
3333

3434
@SubscribeEvent
3535
public void onPlayerRecieveAchievement(AchievementEvent event) {
36-
if (DCConfig.sendPlayerAchievementMessages) {
36+
if (DCConfig.enabled && DCConfig.sendPlayerAchievementMessages) {
3737
if (event.getEntityPlayer() instanceof EntityPlayerMP) {
3838
if (((EntityPlayerMP) event.getEntityPlayer()).getStatFile().hasAchievementUnlocked(event.getAchievement())) {
3939
return;
@@ -48,14 +48,14 @@ public void onPlayerRecieveAchievement(AchievementEvent event) {
4848

4949
@SubscribeEvent
5050
public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
51-
if (DCConfig.sendPlayerJoinLeaveMessages) {
51+
if (DCConfig.enabled && DCConfig.sendPlayerJoinLeaveMessages) {
5252
DiscordThread.instance.sendMessageToAllChannels(MiscUtils.createLoggedInMessage(event.player));
5353
}
5454
}
5555

5656
@SubscribeEvent
5757
public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
58-
if (DCConfig.sendPlayerJoinLeaveMessages) {
58+
if (DCConfig.enabled && DCConfig.sendPlayerJoinLeaveMessages) {
5959
DiscordThread.instance.sendMessageToAllChannels(MiscUtils.createLoggedOutMessage(event.player));
6060
}
6161
}

0 commit comments

Comments
 (0)