OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-19 07:33:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-2790: Remove negative item ID filtering again

Browse source
This commit is contained in:
md_5 2016-11-18 15:12:11 +11:00
parent 0805f60443
commit 8095a750e7
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nms-patches/ItemStack.patch
View file

@ -20,7 +20,7 @@
public final class ItemStack {
public static final ItemStack a = new ItemStack((Item) null);
@@ -46,6 +59,15 @@
@@ -46,28 +59,49 @@
this.item = item;
this.damage = j;
this.count = i;
@ -34,9 +34,11 @@
+ }
+ // CraftBukkit end
if (this.damage < 0) {
this.damage = 0;
- this.damage = 0;
+ // this.damage = 0; // CraftBukkit - remove this.
}
@@ -54,20 +76,32 @@
this.F();
}
private void F() {
@ -52,7 +54,7 @@
- this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
+ // CraftBukkit start - Route through setData for filtering
+ // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
+ this.setData(Math.max(0, nbttagcompound.getShort("Damage")));
+ this.setData(nbttagcompound.getShort("Damage"));
+ // CraftBukkit end
+
if (nbttagcompound.hasKeyOfType("tag", 10)) {
@ -247,7 +249,8 @@
+ // CraftBukkit end
this.damage = i;
if (this.damage < 0) {
this.damage = 0;
- this.damage = 0;
+ // this.damage = 0; // CraftBukkit - remove this.
}
-
}