Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop entity experience on death

Browse Source
This commit is contained in:
Shane Freeder
2019-12-13 15:21:58 +00:00
parent d413dca4ee
commit ae68db1f0e
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
View File

@@ -1,14 +1,14 @@
From cb90df7c7d0d0a81be49f2aea7ef317d2408ef3b Mon Sep 17 00:00:00 2001
From 7c80dba0d3a274a5f604ad236f1f12aa13449e31 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Mon, 19 Aug 2019 19:42:35 +0500
Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index aa0118a7c..4690ef840 100644
index 43b8a722d..e3c562a63 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2890,10 +2890,13 @@ public abstract class EntityLiving extends Entity {
@@ -2891,10 +2891,13 @@ public abstract class EntityLiving extends Entity {
this.datawatcher.set(EntityLiving.ao, (byte) j);
}
@@ -24,7 +24,7 @@ index aa0118a7c..4690ef840 100644
this.activeItem = itemstack;
this.bl = itemstack.k();
if (!this.world.isClientSide) {
@@ -2969,6 +2972,7 @@ public abstract class EntityLiving extends Entity {
@@ -2970,6 +2973,7 @@ public abstract class EntityLiving extends Entity {
this.clearActiveItem();
} else {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@@ -32,7 +32,7 @@ index aa0118a7c..4690ef840 100644
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -2999,8 +3003,8 @@ public abstract class EntityLiving extends Entity {
@@ -3000,8 +3004,8 @@ public abstract class EntityLiving extends Entity {
this.a(this.getRaisedHand(), itemstack);
// CraftBukkit end
this.dH();