merge with head

By: stevenh <steven.hartland@multiplay.co.uk>

paper-api/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java

@@ -0,0 +1,36 @@
+
+package org.bukkit.event.entity;
+
+import java.util.List;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+
+/**
+ * Thrown whenever a LivingEntity dies
+ */
+public class EntityDeathEvent extends EntityEvent {
+    private List<ItemStack> drops;
+
+    public EntityDeathEvent(final Type type, final Entity what, final List<ItemStack> drops) {
+        super(type, what);
+        this.drops = drops;
+    }
+
+    /**
+     * Sets what items will be dropped when this entity dies
+     *
+     * @param drops Items to drop when the entity dies
+     */
+    public void setDrops(final List<ItemStack> drops) {
+        this.drops = drops;
+    }
+
+    /**
+     * Gets all the items which will drop when the entity dies
+     *
+     * @return Items to drop when the entity dies
+     */
+    public List<ItemStack> getDrops() {
+        return drops;
+    }
+}

paper-api/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java

@@ -0,0 +1,99 @@
+package org.bukkit.event.entity;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Cancellable;
+
+/**
+ * This event is fired when a mob (or any creature) targets another entity
+ * @author tkelly
+ */
+public class EntityTargetEvent extends EntityEvent implements Cancellable {
+    private boolean cancel;
+    private Entity target;
+    private TargetReason reason;
+
+    public EntityTargetEvent(Entity entity, Entity target, TargetReason reason) {
+        super(Type.ENTITY_TARGET, entity);
+        this.target = target;
+        this.cancel = false;
+        this.reason = reason;
+    }
+
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    /**
+     * Cancel the change in target. The entity will remain with their original
+     * target, whether that is nothing or another entity.
+     * @param cancel
+     */
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    /**
+     * Returns the reason for the targeting
+     */
+    public TargetReason getReason() {
+        return reason;
+    }
+
+    /**
+     * Get the entity that this is target.
+     * This is possible to be null in the case that the event is called when
+     * the mob forgets its target.
+     */
+    public Entity getTarget() {
+        return target;
+    }
+
+    /**
+     * Set the entity that you want the mob to target instead.
+     * It is possible to be null, null will cause the entity to be
+     * target-less.
+     *
+     * This is different from cancelling the event. Cancelling the event
+     * will cause the entity to keep an original target, while setting to be
+     * null will cause the entity to be reset
+     *
+     * @param target The entity to target
+     */
+    public void setTarget(Entity target) {
+        this.target = target;
+    }
+
+    /**
+     * An enum to specify the reason for the targeting
+     */
+    public enum TargetReason
+    {
+        /**
+         * When the entity's target has died, and so it no longer targets it
+         */
+        TARGET_DIED,
+        /**
+         * When the entity doesn't have a target, so it attacks the nearest
+         * player
+         */
+        CLOSEST_PLAYER,
+        /**
+         * When the target attacks the entity, so entity targets it
+         */
+        TARGET_ATTACKED_ENTITY,
+        /**
+         * When the target attacks a fellow pig zombie, so the whole group
+         * will target him with this reason.
+         */
+        PIG_ZOMBIE_TARGET,
+        /**
+         * When the target is forgotten for whatever reason.
+         * Currently only occurs in with spiders when there is a high brightness
+         */
+        FORGOT_TARGET,
+        /**
+         * For custom calls to the event
+         */
+        CUSTOM
+    }
+}