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

SPIGOT-1758: Apply correct ItemMeta to new CommandBlock types

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-05 15:52:44 +11:00
parent 637b5fb592
commit 4fc9890f64
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
View File

@@ -103,6 +103,8 @@ public final class CraftItemFactory implements ItemFactory {
case BREWING_STAND_ITEM: case BREWING_STAND_ITEM:
case ENCHANTMENT_TABLE: case ENCHANTMENT_TABLE:
case COMMAND: case COMMAND:
case COMMAND_REPEATING:
case COMMAND_CHAIN:
case BEACON: case BEACON:
case DAYLIGHT_DETECTOR: case DAYLIGHT_DETECTOR:
case DAYLIGHT_DETECTOR_INVERTED: case DAYLIGHT_DETECTOR_INVERTED:

2
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View File

@@ -365,6 +365,8 @@ public final class CraftItemStack extends ItemStack {
case BREWING_STAND_ITEM: case BREWING_STAND_ITEM:
case ENCHANTMENT_TABLE: case ENCHANTMENT_TABLE:
case COMMAND: case COMMAND:
case COMMAND_REPEATING:
case COMMAND_CHAIN:
case BEACON: case BEACON:
case DAYLIGHT_DETECTOR: case DAYLIGHT_DETECTOR:
case DAYLIGHT_DETECTOR_INVERTED: case DAYLIGHT_DETECTOR_INVERTED:

6
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View File

@@ -166,6 +166,8 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
case BREWING_STAND_ITEM: case BREWING_STAND_ITEM:
case ENCHANTMENT_TABLE: case ENCHANTMENT_TABLE:
case COMMAND: case COMMAND:
case COMMAND_REPEATING:
case COMMAND_CHAIN:
case BEACON: case BEACON:
case DAYLIGHT_DETECTOR: case DAYLIGHT_DETECTOR:
case DAYLIGHT_DETECTOR_INVERTED: case DAYLIGHT_DETECTOR_INVERTED:
@@ -248,6 +250,8 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
} }
return new CraftSkull(material, (TileEntitySkull) te); return new CraftSkull(material, (TileEntitySkull) te);
case COMMAND: case COMMAND:
case COMMAND_REPEATING:
case COMMAND_CHAIN:
if (te == null) { if (te == null) {
te = new TileEntityCommand(); te = new TileEntityCommand();
} }
@@ -316,6 +320,8 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
valid = te instanceof TileEntitySkull; valid = te instanceof TileEntitySkull;
break; break;
case COMMAND: case COMMAND:
case COMMAND_REPEATING:
case COMMAND_CHAIN:
valid = te instanceof TileEntityCommand; valid = te instanceof TileEntityCommand;
break; break;
case BEACON: case BEACON: