Fix things after rebase

This commit is contained in:
TfT_02 2013-10-26 00:21:20 +02:00
parent 2497c62ada
commit b1095ce1a6
2 changed files with 9 additions and 3 deletions

View File

@ -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;
}

View File

@ -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 {