From d0d9868b5fd45f492dfd6d1bd0453ef322b4c81a Mon Sep 17 00:00:00 2001 From: NuclearW Date: Tue, 21 Feb 2012 00:35:09 -0500 Subject: [PATCH] Change priority of sheep shearing Cleanup --- .../com/gmail/nossr50/datatypes/treasure/FishingTreasure.java | 3 --- .../java/com/gmail/nossr50/listeners/mcPlayerListener.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java b/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java index 097851c03..ad7331283 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java +++ b/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java @@ -3,13 +3,11 @@ package com.gmail.nossr50.datatypes.treasure; import org.bukkit.inventory.ItemStack; public class FishingTreasure extends Treasure { - private int maxLevel; public FishingTreasure(ItemStack drop, int xp, Double dropChance, int dropLevel, int maxLevel) { super(drop, xp, dropChance, dropLevel); this.setMaxLevel(maxLevel); - // TODO Auto-generated constructor stub } public int getMaxLevel() { @@ -19,5 +17,4 @@ public class FishingTreasure extends Treasure { public void setMaxLevel(int maxLevel) { this.maxLevel = maxLevel; } - } diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java index b6e58322f..c6ab79412 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java @@ -78,7 +78,7 @@ public class mcPlayerListener implements Listener plugin = instance; } - @EventHandler(ignoreCancelled = true) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onSheepUndressing(PlayerShearEntityEvent event) { Player player = event.getPlayer();