From b1095ce1a66737b300389607988d6405e13cd45f Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Sat, 26 Oct 2013 00:21:20 +0200
Subject: [PATCH] Fix things after rebase

---
 .../nossr50/events/abilities/McMMOPlayerAbilityEvent.java   | 6 ++++++
 .../com/gmail/nossr50/listeners/ScoreboardsListener.java    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/events/abilities/McMMOPlayerAbilityEvent.java b/src/main/java/com/gmail/nossr50/events/abilities/McMMOPlayerAbilityEvent.java
index 377158c5d..c27be7318 100644
--- a/src/main/java/com/gmail/nossr50/events/abilities/McMMOPlayerAbilityEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/abilities/McMMOPlayerAbilityEvent.java
@@ -8,6 +8,7 @@ import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 
 public abstract class McMMOPlayerAbilityEvent extends PlayerEvent {
+    private SkillType skill;
     private AbilityType ability;
     private boolean useParticleEffects;
 
@@ -30,6 +31,11 @@ public abstract class McMMOPlayerAbilityEvent extends PlayerEvent {
         this.useParticleEffects = useParticleEffects;
     }
 
+    @Deprecated
+    public SkillType getSkill() {
+        return skill;
+    }
+
     public AbilityType getAbility() {
         return ability;
     }
diff --git a/src/main/java/com/gmail/nossr50/listeners/ScoreboardsListener.java b/src/main/java/com/gmail/nossr50/listeners/ScoreboardsListener.java
index 2156e170a..93b50c2f2 100644
--- a/src/main/java/com/gmail/nossr50/listeners/ScoreboardsListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/ScoreboardsListener.java
@@ -6,9 +6,9 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
-import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
+import com.gmail.nossr50.events.abilities.McMMOPlayerAbilityActivateEvent;
+import com.gmail.nossr50.events.experience.levels.McMMOPlayerLevelUpEvent;
+import com.gmail.nossr50.events.experience.xp.McMMOPlayerXpGainEvent;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 
 public class ScoreboardsListener implements Listener {