diff options
| author | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
| commit | c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch) | |
| tree | 9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/EntityItem.patch | |
| parent | 4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff) | |
| download | craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip | |
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/EntityItem.patch')
| -rw-r--r-- | nms-patches/EntityItem.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nms-patches/EntityItem.patch b/nms-patches/EntityItem.patch index 5699d56e..2c8a05d7 100644 --- a/nms-patches/EntityItem.patch +++ b/nms-patches/EntityItem.patch @@ -1,14 +1,14 @@ --- a/net/minecraft/server/EntityItem.java +++ b/net/minecraft/server/EntityItem.java -@@ -4,6 +4,7 @@ - import java.util.Iterator; +@@ -5,6 +5,7 @@ + import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.bukkit.event.player.PlayerPickupItemEvent; // CraftBukkit public class EntityItem extends Entity { -@@ -15,6 +16,7 @@ +@@ -16,6 +17,7 @@ private String g; private String h; public float a; @@ -16,7 +16,7 @@ public EntityItem(World world, double d0, double d1, double d2) { super(world); -@@ -30,6 +32,11 @@ +@@ -31,6 +33,11 @@ public EntityItem(World world, double d0, double d1, double d2, ItemStack itemstack) { this(world, d0, d1, d2); @@ -28,7 +28,7 @@ this.setItemStack(itemstack); } -@@ -54,9 +61,12 @@ +@@ -55,9 +62,12 @@ this.die(); } else { super.m(); @@ -44,7 +44,7 @@ this.lastX = this.locX; this.lastY = this.locY; -@@ -92,12 +102,20 @@ +@@ -93,12 +103,20 @@ this.motY *= -0.5D; } @@ -65,7 +65,7 @@ this.die(); } -@@ -139,6 +157,7 @@ +@@ -140,6 +158,7 @@ } else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) { return false; } else { @@ -73,7 +73,7 @@ itemstack1.count += itemstack.count; entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay); entityitem.age = Math.min(entityitem.age, this.age); -@@ -185,6 +204,11 @@ +@@ -186,6 +205,11 @@ } else if (this.getItemStack() != null && this.getItemStack().getItem() == Items.NETHER_STAR && damagesource.isExplosion()) { return false; } else { @@ -85,7 +85,7 @@ this.ao(); this.f = (int) ((float) this.f - f); if (this.f <= 0) { -@@ -230,7 +254,18 @@ +@@ -231,7 +255,18 @@ NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Item"); @@ -105,7 +105,7 @@ if (this.getItemStack() == null) { this.die(); } -@@ -242,6 +277,26 @@ +@@ -243,6 +278,26 @@ ItemStack itemstack = this.getItemStack(); int i = itemstack.count; |