Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-22 07:11:54 +01:00
Code Issues Projects Releases Wiki Activity

Made EatEvents ItemEvents (#965)

Browse Source
This commit is contained in:
DasLixou 2022-04-23 19:26:22 +02:00 committed by GitHub
parent c32153d221
commit e2dac1c46e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minestom/server/event/player/PlayerEatEvent.java
View File

@ -2,6 +2,7 @@ package net.minestom.server.event.player;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.event.trait.EntityInstanceEvent; import net.minestom.server.event.trait.EntityInstanceEvent;
import net.minestom.server.event.trait.ItemEvent;
import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.event.trait.PlayerEvent;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -9,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
/** /**
* Called when a player is finished eating. * Called when a player is finished eating.
*/ */
public class PlayerEatEvent implements PlayerEvent, EntityInstanceEvent { public class PlayerEatEvent implements ItemEvent, PlayerEvent, EntityInstanceEvent {
private final Player player; private final Player player;
private final ItemStack foodItem; private final ItemStack foodItem;
@ -25,7 +26,9 @@ public class PlayerEatEvent implements PlayerEvent, EntityInstanceEvent {
* Gets the food item that has been eaten. * Gets the food item that has been eaten.
* *
* @return the food item * @return the food item
* @deprecated use getItemStack() for the eaten item
*/ */
@Deprecated
public @NotNull ItemStack getFoodItem() { public @NotNull ItemStack getFoodItem() {
return foodItem; return foodItem;
} }
@ -38,4 +41,12 @@ public class PlayerEatEvent implements PlayerEvent, EntityInstanceEvent {
public @NotNull Player getPlayer() { public @NotNull Player getPlayer() {
return player; return player;
} }
/**
* Gets the food item that has been eaten.
*
* @return the food item
*/
@Override
public @NotNull ItemStack getItemStack() { return foodItem; }
} }

13
src/main/java/net/minestom/server/event/player/PlayerPreEatEvent.java
View File

@ -3,6 +3,7 @@ package net.minestom.server.event.player;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.CancellableEvent;
import net.minestom.server.event.trait.EntityInstanceEvent; import net.minestom.server.event.trait.EntityInstanceEvent;
import net.minestom.server.event.trait.ItemEvent;
import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.event.trait.PlayerEvent;
import net.minestom.server.item.ItemStack; import net.minestom.server.item.ItemStack;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
* or to cancel its processing, cancelling the event means that the player will * or to cancel its processing, cancelling the event means that the player will
* continue the animation indefinitely. * continue the animation indefinitely.
*/ */
public class PlayerPreEatEvent implements PlayerEvent, EntityInstanceEvent, CancellableEvent { public class PlayerPreEatEvent implements ItemEvent, PlayerEvent, EntityInstanceEvent, CancellableEvent {
private final Player player; private final Player player;
private final ItemStack foodItem; private final ItemStack foodItem;
@ -32,7 +33,9 @@ public class PlayerPreEatEvent implements PlayerEvent, EntityInstanceEvent, Canc
* The food item which will be eaten. * The food item which will be eaten.
* *
* @return the food item * @return the food item
* @deprecated use getItemStack() for the eaten item
*/ */
@Deprecated
public @NotNull ItemStack getFoodItem() { public @NotNull ItemStack getFoodItem() {
return foodItem; return foodItem;
} }
@ -75,4 +78,12 @@ public class PlayerPreEatEvent implements PlayerEvent, EntityInstanceEvent, Canc
public @NotNull Player getPlayer() { public @NotNull Player getPlayer() {
return player; return player;
} }
/**
* The food item which will be eaten.
*
* @return the food item
*/
@Override
public @NotNull ItemStack getItemStack() { return foodItem; }
} }