mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-01 17:01:56 +01:00
Remove the item from the correct hand when spawn egg depletes
This commit is contained in:
parent
94a6e8cb09
commit
76ccb4c5f0
1 changed files with 32 additions and 0 deletions
|
@ -0,0 +1,32 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Aikar <aikar@aikar.co>
|
||||||
|
Date: Sat, 18 Jun 2016 01:49:22 -0400
|
||||||
|
Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
|
||||||
|
@@ -0,0 +0,0 @@ public abstract class EntityAgeable extends EntityCreature {
|
||||||
|
--itemstack.count;
|
||||||
|
// CraftBukkit start - allow less than 0 stacks as "infinite"
|
||||||
|
if (itemstack.count == 0) {
|
||||||
|
- entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null);
|
||||||
|
+ entityhuman.setHeldItem(enumhand, null); // Paper
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
}
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
|
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public void setHeldItem(EnumHand enumhand, @Nullable ItemStack itemstack) { a(enumhand, itemstack); } // Paper // OBFHELPER
|
||||||
|
public void a(EnumHand enumhand, @Nullable ItemStack itemstack) {
|
||||||
|
if (enumhand == EnumHand.MAIN_HAND) {
|
||||||
|
this.setSlot(EnumItemSlot.MAINHAND, itemstack);
|
||||||
|
--
|
Loading…
Reference in a new issue