From b2d4be48996ea88d2b2817f3e46a719b31d86557 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Mon, 15 May 2017 22:44:52 -0700
Subject: [PATCH] fixing this npe
---
src/main/java/com/comandante/creeper/npc/NpcBuilder.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/npc/NpcBuilder.java b/src/main/java/com/comandante/creeper/npc/NpcBuilder.java
index c2af8ecc..46e98cba 100644
--- a/src/main/java/com/comandante/creeper/npc/NpcBuilder.java
+++ b/src/main/java/com/comandante/creeper/npc/NpcBuilder.java
@@ -147,8 +147,10 @@ public class NpcBuilder {
public Npc createNpc() {
checkNotNull(gameManager);
- if (loot.getLootGoldMin() > loot.getLootGoldMax()) {
- throw new RuntimeException("Invalid loot configuration.");
+ if (loot != null ) {
+ if (loot.getLootGoldMin() > loot.getLootGoldMax()) {
+ throw new RuntimeException("Invalid loot configuration.");
+ }
}
return new Npc(gameManager, name, colorName, lastPhraseTimestamp, stats, dieMessage, temperament, roamAreas, validTriggers, loot, spawnRules, attackMessages, criticalAttackMessages, battleMessages, idleMessages);
}
--
GitLab