summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-05 15:52:44 +1100
committermd_5 <git@md-5.net>2016-03-05 15:52:44 +1100
commit94ba82430263ebb42632f51bc266c5a0297c10b7 (patch)
treed13ab467cc95bc3191d489e9a10073cf13e6106e /src/main/java/org
parentdcc45717b9841fd14538c138c1a7409060dc9b07 (diff)
downloadcraftbukkit-94ba82430263ebb42632f51bc266c5a0297c10b7.tar
craftbukkit-94ba82430263ebb42632f51bc266c5a0297c10b7.tar.gz
craftbukkit-94ba82430263ebb42632f51bc266c5a0297c10b7.tar.lz
craftbukkit-94ba82430263ebb42632f51bc266c5a0297c10b7.tar.xz
craftbukkit-94ba82430263ebb42632f51bc266c5a0297c10b7.zip
SPIGOT-1758: Apply correct ItemMeta to new CommandBlock types
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java6
3 files changed, 10 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 0c685e44..3bc313cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -103,6 +103,8 @@ public final class CraftItemFactory implements ItemFactory {
case BREWING_STAND_ITEM:
case ENCHANTMENT_TABLE:
case COMMAND:
+ case COMMAND_REPEATING:
+ case COMMAND_CHAIN:
case BEACON:
case DAYLIGHT_DETECTOR:
case DAYLIGHT_DETECTOR_INVERTED:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index b120a7ed..8b6fd4ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -365,6 +365,8 @@ public final class CraftItemStack extends ItemStack {
case BREWING_STAND_ITEM:
case ENCHANTMENT_TABLE:
case COMMAND:
+ case COMMAND_REPEATING:
+ case COMMAND_CHAIN:
case BEACON:
case DAYLIGHT_DETECTOR:
case DAYLIGHT_DETECTOR_INVERTED:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
index 4f1415b7..b57b6e9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
@@ -166,6 +166,8 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
case BREWING_STAND_ITEM:
case ENCHANTMENT_TABLE:
case COMMAND:
+ case COMMAND_REPEATING:
+ case COMMAND_CHAIN:
case BEACON:
case DAYLIGHT_DETECTOR:
case DAYLIGHT_DETECTOR_INVERTED:
@@ -248,6 +250,8 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
}
return new CraftSkull(material, (TileEntitySkull) te);
case COMMAND:
+ case COMMAND_REPEATING:
+ case COMMAND_CHAIN:
if (te == null) {
te = new TileEntityCommand();
}
@@ -316,6 +320,8 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
valid = te instanceof TileEntitySkull;
break;
case COMMAND:
+ case COMMAND_REPEATING:
+ case COMMAND_CHAIN:
valid = te instanceof TileEntityCommand;
break;
case BEACON: