Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-06 02:42:14 +01:00
Code Issues Projects Releases Wiki Activity
09d1277482
Paper/Spigot-Server-Patches/0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch

24 lines
1.1 KiB
Diff
Raw Normal View History

Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 07:00:51 +01:00
From ed42fa5362cb89e856e137f264bd18318ea3631e Mon Sep 17 00:00:00 2001
Fix NFE caused by attempting to read an EMPTY ItemStack Thanks @gabizou
2017-04-10 08:50:46 +02:00
From: kashike <kashike@vq.lc>
Date: Sun, 9 Apr 2017 23:50:15 -0700
Update upstream CB/S
2017-04-11 05:11:26 +02:00
Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
Fix NFE caused by attempting to read an EMPTY ItemStack Thanks @gabizou
2017-04-10 08:50:46 +02:00
Update upstream CB/S
2017-04-11 05:11:26 +02:00
Thanks @gabizou
Fix NFE caused by attempting to read an EMPTY ItemStack Thanks @gabizou
2017-04-10 08:50:46 +02:00
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 07:00:51 +01:00
index 9465f4c16..52cb34abd 100644
Fix NFE caused by attempting to read an EMPTY ItemStack Thanks @gabizou
2017-04-10 08:50:46 +02:00
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
Auto sort enchants on items - Fixes #915 This ensures that enchants are never added in inconsistent order. The client shows the enchants in a sorted order already This will auto fix previously created items too on load.
2017-12-19 23:56:13 +01:00
@@ -119,7 +119,7 @@ public final class ItemStack {
Fix NFE caused by attempting to read an EMPTY ItemStack Thanks @gabizou
2017-04-10 08:50:46 +02:00
// CraftBukkit - break into own method
public void load(NBTTagCompound nbttagcompound) {
- this.item = Item.b(nbttagcompound.getString("id"));
+ this.item = nbttagcompound.hasKeyOfType("id", 8) ? Item.b(nbttagcompound.getString("id")) : Item.getItemOf(Blocks.AIR); // Paper - fix NumberFormatException caused by attempting to read an EMPTY ItemStack
this.count = nbttagcompound.getByte("Count");
// CraftBukkit start - Route through setData for filtering
// this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
--
Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 07:00:51 +01:00
2.16.1
Fix NFE caused by attempting to read an EMPTY ItemStack Thanks @gabizou
2017-04-10 08:50:46 +02:00
Reference in New Issue Copy Permalink