diff --git a/Changelog.txt b/Changelog.txt index 768d10b20..a2a5db248 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -12,6 +12,7 @@ Version 1.3.11 + Added compatibility for pvp-prevention plugins for Serrated Strikes = Fixed bug where mcMMO could throw NPE errors if trees cut down were from a custom mod and had an id of 17 = Fixed dupe bug where mcMMO would ignore other block-protection plugins for various abilities + = Fixed NPE with hardcore mode's vampirism Version 1.3.10 + Added 1.3.1 compatibility diff --git a/src/main/java/com/gmail/nossr50/listeners/HardcoreListener.java b/src/main/java/com/gmail/nossr50/listeners/HardcoreListener.java index dba79cc89..49f2176bd 100644 --- a/src/main/java/com/gmail/nossr50/listeners/HardcoreListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/HardcoreListener.java @@ -22,7 +22,7 @@ public class HardcoreListener implements Listener { Player player = event.getEntity(); //Note this returns a Player object for this subevent if (!Permissions.getInstance().hardcoremodeBypass(player)) { - if (Config.getInstance().getHardcoreVampirismEnabled()) { + if (player.getKiller() != null && Config.getInstance().getHardcoreVampirismEnabled()) { Hardcore.invokeVampirism(player.getKiller(), player); }