From 6e23feb52f0631da2a3479744866c2d953f2dd4f Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Tue, 19 Sep 2017 21:43:38 -0400
Subject: [PATCH] fix: fixed some null pointer exceptions
---
src/main/java/com/syncleus/aethermud/items/ItemImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/syncleus/aethermud/items/ItemImpl.java b/src/main/java/com/syncleus/aethermud/items/ItemImpl.java
index 18d60ec8..895ac8d2 100644
--- a/src/main/java/com/syncleus/aethermud/items/ItemImpl.java
+++ b/src/main/java/com/syncleus/aethermud/items/ItemImpl.java
@@ -53,14 +53,14 @@ public class ItemImpl implements Item {
this.itemName = itemName;
this.itemDescription = itemDescription;
this.internalItemName = internalItemName;
- this.itemTriggers = Lists.newArrayList(itemTriggers);
+ this.itemTriggers = (itemTriggers == null ? Lists.newArrayList() : Lists.newArrayList(itemTriggers));
this.restingName = restingName;
this.loot = loot;
this.itemHalfLifeTicks = itemHalfLifeTicks;
this.equipment = equipment;
this.rarity = rarity;
this.valueInGold = valueInGold;
- this.effects = Sets.newHashSet(effects);
+ this.effects = (effects == null ? Sets.newHashSet() : Sets.newHashSet(effects));
this.maxUses = maxUses;
this.isDisposable = isDisposable;
this.validTimeOfDays = (validTimeOfDays == null ? Lists.newArrayList() : Lists.newArrayList(validTimeOfDays));
--
GitLab