Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't let items types be null.

Browse Source 
Better fail-fast if registry doesn't load? or why-ever else this happens
This commit is contained in:
wizjany 2019-03-26 22:30:24 -04:00
parent 6b3426e1de
commit 74bff83e38
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseItem.java
View File

@ -25,6 +25,8 @@ import com.sk89q.worldedit.world.item.ItemType;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Represents an item, without an amount value. See {@link BaseItemStack} * Represents an item, without an amount value. See {@link BaseItemStack}
* for an instance with stack amount information. * for an instance with stack amount information.
@ -32,7 +34,7 @@ import javax.annotation.Nullable;
* <p>This class may be removed in the future.</p> * <p>This class may be removed in the future.</p>
*/ */
public class BaseItem implements NbtValued { public class BaseItem implements NbtValued {
private ItemType itemType; private ItemType itemType;
@Nullable @Nullable
private CompoundTag nbtData; private CompoundTag nbtData;
@ -43,6 +45,7 @@ public class BaseItem implements NbtValued {
* @param itemType Type of the item * @param itemType Type of the item
*/ */
public BaseItem(ItemType itemType) { public BaseItem(ItemType itemType) {
checkNotNull(itemType);
this.itemType = itemType; this.itemType = itemType;
} }
@ -52,7 +55,8 @@ public class BaseItem implements NbtValued {
* @param itemType Type of the item * @param itemType Type of the item
* @param tag NBT Compound tag * @param tag NBT Compound tag
*/ */
public BaseItem(ItemType itemType, CompoundTag tag) { public BaseItem(ItemType itemType, @Nullable CompoundTag tag) {
checkNotNull(itemType);
this.itemType = itemType; this.itemType = itemType;
this.nbtData = tag; this.nbtData = tag;
} }