Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 02:55:47 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5443: BEE_NEST BlockState

Browse Source 
- Add missing BEE_NEST block state
- Add a missing break in CraftMetaBlockState
This commit is contained in:
ShaneBeee 2019-12-11 21:40:10 -08:00 committed by md_5
parent 73698cf88d
commit b97d581af2
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@ -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);

3
src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
View File

@ -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:

1
src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View File

@ -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());

4
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View File

@ -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;