From d484ccc15eeb66c34a2888b0753b68bf417344f9 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 25 Sep 2019 15:54:44 -0700 Subject: [PATCH] Minor tweaks --- .../com/gmail/nossr50/datatypes/items/ItemMatchProperty.java | 2 +- .../java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/datatypes/items/ItemMatchProperty.java b/src/main/java/com/gmail/nossr50/datatypes/items/ItemMatchProperty.java index 18c033b1a..40f355715 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/items/ItemMatchProperty.java +++ b/src/main/java/com/gmail/nossr50/datatypes/items/ItemMatchProperty.java @@ -1,6 +1,6 @@ package com.gmail.nossr50.datatypes.items; -import net.minecraft.server.v1_13_R2.NBTTagCompound; +import net.minecraft.server.v1_14_R1.NBTTagCompound; import java.util.Objects; diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java index 37ed12b66..295bffd53 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -927,7 +927,7 @@ public class McMMOPlayer { return; } - if (pluginRef.getEventManager().callPlayerAbilityActivateEvent(player, primarySkillType).isCancelled()) { + if (pluginRef.getEventManager().callPlayerAbilityActivateEvent(player, primarySkillType, superAbility).isCancelled()) { return; }