2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
|
|
Date: Sun, 21 Jun 2015 15:07:20 -0400
|
|
|
|
Subject: [PATCH] Custom replacement for eaten items
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2024-06-13 19:30:39 +02:00
|
|
|
index f8b771a10b9bf123b55b8f3097bb8c6da607c413..d63d72d5cafdcdf3e8d8f5e837bf7aeb0ce18c74 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2024-06-13 19:30:39 +02:00
|
|
|
@@ -3830,10 +3830,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2021-11-24 23:26:32 +01:00
|
|
|
this.triggerItemUseEffects(this.useItem, 16);
|
|
|
|
// CraftBukkit start - fire PlayerItemConsumeEvent
|
|
|
|
ItemStack itemstack;
|
2022-10-02 09:56:36 +02:00
|
|
|
+ PlayerItemConsumeEvent event = null; // Paper
|
2021-11-24 23:26:32 +01:00
|
|
|
if (this instanceof ServerPlayer) {
|
|
|
|
org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.useItem);
|
2022-10-02 09:56:36 +02:00
|
|
|
org.bukkit.inventory.EquipmentSlot hand = org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(enumhand);
|
|
|
|
- PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand);
|
|
|
|
+ event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); // Paper
|
2023-06-07 20:49:17 +02:00
|
|
|
this.level().getCraftServer().getPluginManager().callEvent(event);
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-11-24 23:26:32 +01:00
|
|
|
if (event.isCancelled()) {
|
2024-06-13 19:30:39 +02:00
|
|
|
@@ -3847,6 +3848,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2021-11-24 23:26:32 +01:00
|
|
|
} else {
|
2023-06-07 20:49:17 +02:00
|
|
|
itemstack = this.useItem.finishUsingItem(this.level(), this);
|
2021-11-24 23:26:32 +01:00
|
|
|
}
|
2023-06-07 20:49:17 +02:00
|
|
|
+ // Paper start - save the default replacement item and change it if necessary
|
|
|
|
+ final ItemStack defaultReplacement = itemstack;
|
|
|
|
+ if (event != null && event.getReplacement() != null) {
|
|
|
|
+ itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2021-11-24 23:26:32 +01:00
|
|
|
// CraftBukkit end
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-11-24 23:26:32 +01:00
|
|
|
if (itemstack != this.useItem) {
|
2024-06-13 19:30:39 +02:00
|
|
|
@@ -3854,6 +3861,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2021-11-24 23:26:32 +01:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-11-24 23:26:32 +01:00
|
|
|
this.stopUsingItem();
|
2023-06-07 20:49:17 +02:00
|
|
|
+ // Paper start - if the replacement is anything but the default, update the client inventory
|
|
|
|
+ if (this instanceof ServerPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
|
|
|
|
+ ((ServerPlayer) this).getBukkitEntity().updateInventory();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2021-11-24 23:26:32 +01:00
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-11-24 23:26:32 +01:00
|
|
|
}
|