mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
Update upstream
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
From a9c7ccafda0a5fa8c590bd072fc980e707664479 Mon Sep 17 00:00:00 2001
|
||||
From 6ea8d9ee2c3ef9e7ab8195adc60b025838161e68 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 3 May 2019 23:39:28 -0500
|
||||
Subject: [PATCH] PlayerFeedAnimalEvent
|
||||
|
||||
---
|
||||
.../purpur/event/PlayerFeedAnimalEvent.java | 63 +++++++++++++++++++
|
||||
1 file changed, 63 insertions(+)
|
||||
.../purpur/event/PlayerFeedAnimalEvent.java | 69 +++++++++++++++++++
|
||||
1 file changed, 69 insertions(+)
|
||||
create mode 100644 src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..e2bb0694
|
||||
index 00000000..0174eb90
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java
|
||||
@@ -0,0 +1,63 @@
|
||||
@@ -0,0 +1,69 @@
|
||||
+package net.pl3x.purpur.event;
|
||||
+
|
||||
+import org.bukkit.entity.Animals;
|
||||
@@ -22,6 +22,7 @@ index 00000000..e2bb0694
|
||||
+import org.bukkit.event.HandlerList;
|
||||
+import org.bukkit.event.entity.EntityEvent;
|
||||
+import org.bukkit.inventory.ItemStack;
|
||||
+import org.jetbrains.annotations.NotNull;
|
||||
+
|
||||
+public class PlayerFeedAnimalEvent extends EntityEvent implements Cancellable {
|
||||
+ private static final HandlerList handlers = new HandlerList();
|
||||
@@ -29,13 +30,14 @@ index 00000000..e2bb0694
|
||||
+ private final ItemStack itemStack;
|
||||
+ private boolean cancel;
|
||||
+
|
||||
+ public PlayerFeedAnimalEvent(Animals entity, Player player, ItemStack food) {
|
||||
+ public PlayerFeedAnimalEvent(@NotNull Animals entity, @NotNull Player player, @NotNull ItemStack food) {
|
||||
+ super(entity);
|
||||
+ this.player = player;
|
||||
+ this.itemStack = food;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ @NotNull
|
||||
+ public Animals getEntity() {
|
||||
+ return (Animals) entity;
|
||||
+ }
|
||||
@@ -45,6 +47,7 @@ index 00000000..e2bb0694
|
||||
+ *
|
||||
+ * @return Player who is involved in this event
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ public Player getPlayer() {
|
||||
+ return player;
|
||||
+ }
|
||||
@@ -54,6 +57,7 @@ index 00000000..e2bb0694
|
||||
+ *
|
||||
+ * @return ItemStack being fed
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ public ItemStack getItemStack() {
|
||||
+ return itemStack;
|
||||
+ }
|
||||
@@ -69,10 +73,12 @@ index 00000000..e2bb0694
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ @NotNull
|
||||
+ public HandlerList getHandlers() {
|
||||
+ return handlers;
|
||||
+ }
|
||||
+
|
||||
+ @NotNull
|
||||
+ public static HandlerList getHandlerList() {
|
||||
+ return handlers;
|
||||
+ }
|
||||
|
||||
Reference in New Issue
Block a user