SPIGOT-5443: BEE_NEST BlockState

- Add missing BEE_NEST block state
- Add a missing break in CraftMetaBlockState
This commit is contained in:
ShaneBeee authored and md_5 committed 2019-12-13 09:12:38 +11:00
1 parent 73698cf88d
commit b97d581af2
4 files changed
+8 -1

No files matched your search

@@ -458,6 +458,7 @@ public class CraftBlock implements Block {
case SMOKER:
return new CraftSmoker(this);
case BEEHIVE:
case BEE_NEST:
return new CraftBeehive(this);
default:
TileEntity tileEntity = world.getTileEntity(position);
@@ -260,7 +260,8 @@ public final class CraftItemFactory implements ItemFactory {
case LECTERN:
case SMOKER:
case BEEHIVE:
return new CraftMetaBlockState(meta, material);
case BEE_NEST:
return new CraftMetaBlockState(meta, material);
case TROPICAL_FISH_BUCKET:
return meta instanceof CraftMetaTropicalFishBucket ? meta : new CraftMetaTropicalFishBucket(meta);
case CROSSBOW:
@@ -511,6 +511,7 @@ public final class CraftItemStack extends ItemStack {
case LECTERN:
case SMOKER:
case BEEHIVE:
case BEE_NEST:
return new CraftMetaBlockState(item.getTag(), CraftMagicNumbers.getMaterial(item.getItem()));
case TROPICAL_FISH_BUCKET:
return new CraftMetaTropicalFishBucket(item.getTag());
@@ -241,6 +241,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
case LECTERN:
case SMOKER:
case BEEHIVE:
case BEE_NEST:
return true;
}
return false;
@@ -503,6 +504,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
te = new TileEntitySmoker();
}
return new CraftSmoker(material, (TileEntitySmoker) te);
case BEE_NEST:
case BEEHIVE:
if (te == null){
te = new TileEntityBeehive();
@@ -674,7 +676,9 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
valid = blockState instanceof CraftSmoker;
break;
case BEEHIVE:
case BEE_NEST:
valid = blockState instanceof CraftBeehive;
break;
default:
valid = false;
break;