From 3fe7d8585ef2812b3507cd58b7b3bf79b103388c Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Wed, 27 Mar 2013 21:12:08 -0400 Subject: [PATCH] Pulling all pending Bukkit-JavaDoc changes By: Edmond Poon --- .../src/main/java/org/bukkit/block/Skull.java | 4 ++-- .../org/bukkit/enchantments/Enchantment.java | 2 +- .../java/org/bukkit/event/EventHandler.java | 20 +++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/block/Skull.java b/paper-api/src/main/java/org/bukkit/block/Skull.java index 35c07bb635..974aea203e 100644 --- a/paper-api/src/main/java/org/bukkit/block/Skull.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/enchantments/Enchantment.java b/paper-api/src/main/java/org/bukkit/enchantments/Enchantment.java index c932c60804..335eeef3c1 100644 --- a/paper-api/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/event/EventHandler.java b/paper-api/src/main/java/org/bukkit/event/EventHandler.java index b0a19c4dcc..166b61d36a 100644 --- a/paper-api/src/main/java/org/bukkit/event/EventHandler.java +++ b/paper-api/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. + *

+ * First priority to the last priority executed: + *

    + *
  1. LOWEST
  2. + *
  3. LOW
  4. + *
  5. NORMAL
  6. + *
  7. HIGH
  8. + *
  9. HIGHEST
  10. + *
  11. MONITOR
  12. + *
+ */ EventPriority priority() default EventPriority.NORMAL; + /** + * Define if the handler ignores a cancelled event. + *

+ * If ignoreCancelled is true and the event is cancelled, the method is + * not called. Otherwise, the method is always called. + */ boolean ignoreCancelled() default false; }