From 6a109cf6bc19e0a3da704f7497300e3ce86a100d Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 24 Jul 2018 08:25:13 +1000 Subject: SPIGOT-4124: Fix misplaced PISTON_HEAD --- src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java | 1 - src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java | 1 - src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 1 - src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java | 2 -- src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java | 1 - 5 files changed, 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index 698d044a..d6e4adf1 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -292,7 +292,6 @@ public class CraftBlock implements Block { case CREEPER_WALL_HEAD: case DRAGON_HEAD: case DRAGON_WALL_HEAD: - case PISTON_HEAD: case PLAYER_HEAD: case PLAYER_WALL_HEAD: case SKELETON_SKULL: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java index 59d2685d..0fb3c238 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -77,7 +77,6 @@ public final class CraftItemFactory implements ItemFactory { case CREEPER_WALL_HEAD: case DRAGON_HEAD: case DRAGON_WALL_HEAD: - case PISTON_HEAD: case PLAYER_HEAD: case PLAYER_WALL_HEAD: case SKELETON_SKULL: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index d41459ef..d7fb0acb 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -335,7 +335,6 @@ public final class CraftItemStack extends ItemStack { case CREEPER_WALL_HEAD: case DRAGON_HEAD: case DRAGON_WALL_HEAD: - case PISTON_HEAD: case PLAYER_HEAD: case PLAYER_WALL_HEAD: case SKELETON_SKULL: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java index 81781339..e0b3df84 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java @@ -310,7 +310,6 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta case CREEPER_WALL_HEAD: case DRAGON_HEAD: case DRAGON_WALL_HEAD: - case PISTON_HEAD: case PLAYER_HEAD: case PLAYER_WALL_HEAD: case SKELETON_SKULL: @@ -465,7 +464,6 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta case CREEPER_WALL_HEAD: case DRAGON_HEAD: case DRAGON_WALL_HEAD: - case PISTON_HEAD: case PLAYER_HEAD: case PLAYER_WALL_HEAD: case SKELETON_SKULL: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java index e3951103..58c07e96 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -101,7 +101,6 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { case CREEPER_WALL_HEAD: case DRAGON_HEAD: case DRAGON_WALL_HEAD: - case PISTON_HEAD: case PLAYER_HEAD: case PLAYER_WALL_HEAD: case SKELETON_SKULL: -- cgit v1.2.3