A bunch more null check \o/

This commit is contained in:
modmuss50 2016-12-06 18:22:18 +00:00
parent 97e5fcc032
commit 5dff31d937
19 changed files with 33 additions and 29 deletions

View file

@ -13,7 +13,7 @@ public class AchievementTriggerer {
@SubscribeEvent
public void onItemPickedUp(ItemPickupEvent event) {
ItemStack stack = event.pickedUp.getEntityItem();
if (stack != null && stack.getItem() instanceof IPickupAchievement) {
if (stack != ItemStack.EMPTY && stack.getItem() instanceof IPickupAchievement) {
Achievement achievement = ((IPickupAchievement) stack.getItem()).getAchievementOnPickup(stack, event.player,
event.pickedUp);
if (achievement != null)
@ -23,7 +23,7 @@ public class AchievementTriggerer {
@SubscribeEvent
public void onItemCrafted(ItemCraftedEvent event) {
if (event.crafting != null && event.crafting.getItem() instanceof ICraftAchievement) {
if (event.crafting != ItemStack.EMPTY && event.crafting.getItem() instanceof ICraftAchievement) {
Achievement achievement = ((ICraftAchievement) event.crafting.getItem())
.getAchievementOnCraft(event.crafting, event.player, event.craftMatrix);
if (achievement != null)