OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-04 14:04:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5034: FoodLevelChangeEvent add getItem method

Browse source
This commit is contained in:
md_5 2019-06-14 19:41:36 +10:00
parent 4090d01f6d
commit 43431ba65b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nms-patches/FoodMetaData.patch
View file

@ -27,7 +27,7 @@
+ int oldFoodLevel = foodLevel; + int oldFoodLevel = foodLevel;
- this.eat(foodinfo.getNutrition(), foodinfo.getSaturationModifier()); - this.eat(foodinfo.getNutrition(), foodinfo.getSaturationModifier());
+ org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, foodinfo.getNutrition() + oldFoodLevel); + org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, foodinfo.getNutrition() + oldFoodLevel, itemstack);
+ +
+ if (!event.isCancelled()) { + if (!event.isCancelled()) {
+ this.eat(event.getFoodLevel() - oldFoodLevel, foodinfo.getSaturationModifier()); + this.eat(event.getFoodLevel() - oldFoodLevel, foodinfo.getSaturationModifier());

6
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -980,7 +980,11 @@ public class CraftEventFactory {
} }
public static FoodLevelChangeEvent callFoodLevelChangeEvent(EntityHuman entity, int level) { public static FoodLevelChangeEvent callFoodLevelChangeEvent(EntityHuman entity, int level) {
FoodLevelChangeEvent event = new FoodLevelChangeEvent(entity.getBukkitEntity(), level); return callFoodLevelChangeEvent(entity, level, null);
}
public static FoodLevelChangeEvent callFoodLevelChangeEvent(EntityHuman entity, int level, ItemStack item) {
FoodLevelChangeEvent event = new FoodLevelChangeEvent(entity.getBukkitEntity(), level, (item == null) ? null : CraftItemStack.asBukkitCopy(item));
entity.getBukkitEntity().getServer().getPluginManager().callEvent(event); entity.getBukkitEntity().getServer().getPluginManager().callEvent(event);
return event; return event;
} }