SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  Fix ItemStack.removeEnchantment returning wrong value
This commit is contained in:
Aikar
2018-08-04 01:22:57 -04:00
parent fc99b0dc70 154a6bba21
commit d8c877daad
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Don-t-call-getItemMeta-on-hasItemMeta.patch
View File

@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 5f3331de13..ae21780964 100644
index 8ca161f0ed..e9bef85c8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {