diff options
author | Edmond Poon <sagaciouszzzz@gmail.com> | 2013-03-27 21:12:08 -0400 |
---|---|---|
committer | Edmond Poon <sagaciouszzzz@gmail.com> | 2013-03-27 21:12:08 -0400 |
commit | bde69789d3ad8e281c0e1837bb199d4038c2d581 (patch) | |
tree | 5ea623869f7cf845e1617e417a5de4837e401b4f /src/main/java | |
parent | 2bb16b29abc5dc552332939597919b9c7b908fbd (diff) | |
download | bukkit-bde69789d3ad8e281c0e1837bb199d4038c2d581.tar bukkit-bde69789d3ad8e281c0e1837bb199d4038c2d581.tar.gz bukkit-bde69789d3ad8e281c0e1837bb199d4038c2d581.tar.lz bukkit-bde69789d3ad8e281c0e1837bb199d4038c2d581.tar.xz bukkit-bde69789d3ad8e281c0e1837bb199d4038c2d581.zip |
Pulling all pending Bukkit-JavaDoc changes
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/bukkit/block/Skull.java | 4 | ||||
-rw-r--r-- | src/main/java/org/bukkit/enchantments/Enchantment.java | 2 | ||||
-rw-r--r-- | src/main/java/org/bukkit/event/EventHandler.java | 20 |
3 files changed, 23 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java index 35c07bb6..974aea20 100644 --- a/src/main/java/org/bukkit/block/Skull.java +++ b/src/main/java/org/bukkit/block/Skull.java @@ -30,14 +30,14 @@ public interface Skull extends BlockState { public boolean setOwner(String name); /** - * Gets the rotation of the skull + * Gets the rotation of the skull in the world * * @return the rotation of the skull */ public BlockFace getRotation(); /** - * Sets the rotation of the skull + * Sets the rotation of the skull in the world * * @param rotation the rotation of the skull */ diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java index c932c608..335eeef3 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java @@ -176,7 +176,7 @@ public abstract class Enchantment { /** * Checks if this Enchantment may be applied to the given {@link ItemStack}. - * This does not check if it conflicts with any enchantmentds already applied to the item. + * This does not check if it conflicts with any enchantments already applied to the item. * * @param item Item to test * @return True if the enchantment may be applied, otherwise False diff --git a/src/main/java/org/bukkit/event/EventHandler.java b/src/main/java/org/bukkit/event/EventHandler.java index b0a19c4d..166b61d3 100644 --- a/src/main/java/org/bukkit/event/EventHandler.java +++ b/src/main/java/org/bukkit/event/EventHandler.java @@ -11,7 +11,27 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface EventHandler { + + /** + * Define the priority of the event. + * <p /> + * First priority to the last priority executed: + * <ol> + * <li>LOWEST</li> + * <li>LOW</li> + * <li>NORMAL</li> + * <li>HIGH</li> + * <li>HIGHEST</li> + * <li>MONITOR</li> + * </ol> + */ EventPriority priority() default EventPriority.NORMAL; + /** + * Define if the handler ignores a cancelled event. + * <p /> + * If ignoreCancelled is true and the event is cancelled, the method is + * not called. Otherwise, the method is always called. + */ boolean ignoreCancelled() default false; } |