summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMelair <melair@caldonia.net>2016-03-02 17:51:36 +0000
committermd_5 <git@md-5.net>2016-03-04 07:19:33 +1100
commit9056e665549101a6b43c7a6570d4ce0c505894e9 (patch)
tree5df0b76ca79998cdbf1a6c7c5071a121e754435d
parent31caee5a947d439f886602469c855ed56c5a1c48 (diff)
downloadcraftbukkit-9056e665549101a6b43c7a6570d4ce0c505894e9.tar
craftbukkit-9056e665549101a6b43c7a6570d4ce0c505894e9.tar.gz
craftbukkit-9056e665549101a6b43c7a6570d4ce0c505894e9.tar.lz
craftbukkit-9056e665549101a6b43c7a6570d4ce0c505894e9.tar.xz
craftbukkit-9056e665549101a6b43c7a6570d4ce0c505894e9.zip
Enable support of PotionMeta on SPLASH_POTION, LINGERING_POTION and TIPPED_ARROW.
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java3
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java3
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index 82f20455..0c685e44 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -76,6 +76,9 @@ public final class CraftItemFactory implements ItemFactory {
case LEATHER_BOOTS:
return meta instanceof CraftMetaLeatherArmor ? meta : new CraftMetaLeatherArmor(meta);
case POTION:
+ case SPLASH_POTION:
+ case LINGERING_POTION:
+ case TIPPED_ARROW:
return meta instanceof CraftMetaPotion ? meta : new CraftMetaPotion(meta);
case MAP:
return meta instanceof CraftMetaMap ? meta : new CraftMetaMap(meta);
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 8bb128e6..b120a7ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -338,6 +338,9 @@ public final class CraftItemStack extends ItemStack {
case LEATHER_BOOTS:
return new CraftMetaLeatherArmor(item.getTag());
case POTION:
+ case SPLASH_POTION:
+ case LINGERING_POTION:
+ case TIPPED_ARROW:
return new CraftMetaPotion(item.getTag());
case MAP:
return new CraftMetaMap(item.getTag());
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
index 5b2d12bb..f6845307 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
@@ -109,6 +109,9 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
boolean applicableTo(Material type) {
switch(type) {
case POTION:
+ case SPLASH_POTION:
+ case LINGERING_POTION:
+ case TIPPED_ARROW:
return true;
default:
return false;