From dcd08c4d37f837c046174977be8c8eb4c5e07be0 Mon Sep 17 00:00:00 2001 From: kordum Date: Thu, 22 Jun 2017 14:53:53 +0300 Subject: [PATCH] #135 Fix NPE if root is null --- build.gradle | 2 +- src/main/java/binnie/core/genetics/ManagerGenetics.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c535598e..e62e80d9 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin" apply plugin: 'forge' -version = "2.0.15" +version = "2.0.16" if (System.getenv("BUILD_NUMBER") != null) { version = version + "-" + System.getenv("BUILD_NUMBER") } diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 6d19e9a2..1db0b64f 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -92,6 +92,10 @@ public class ManagerGenetics extends ManagerBase { } public BreedingSystem getSystem(ISpeciesRoot root) { + // Fix NPE + if (root == null) { + return null; + } return getSystem(root.getUID()); }