From f5deb96d2e7e6e471fcb8993e0f6821acaf5f2da Mon Sep 17 00:00:00 2001
From: Sekwah <sekwah41@gmail.com>
Date: Mon, 12 Aug 2019 09:40:06 +0100
Subject: [PATCH] Upgraded gradle file and fixed a nullpointer

---
 build.gradle                                    |  2 +-
 .../sekwah/advancedportals/portals/Portal.java  | 17 +++++++++++------
 src/main/resources/plugin.yml                   |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4d4da74..284b45a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ tasks.withType(JavaCompile) {
 }
 
 String getPluginData(String tag) {
-    File file = new File("src/main/resources/plugin.yml")
+    File file = file("src/main/resources/plugin.yml")
     String version = "notfound"
     file.readLines("UTF-8").each {String line ->
         line = line.trim()
diff --git a/src/main/java/com/sekwah/advancedportals/portals/Portal.java b/src/main/java/com/sekwah/advancedportals/portals/Portal.java
index d535ed6..556b0c9 100644
--- a/src/main/java/com/sekwah/advancedportals/portals/Portal.java
+++ b/src/main/java/com/sekwah/advancedportals/portals/Portal.java
@@ -74,11 +74,13 @@ public class Portal {
 
                 ConfigurationSection portalConfigSection = portalData.getConfig().getConfigurationSection(portal.toString());
 
-                String[] blockTypesString = portalConfigSection.getString("triggerblock").split(",");
+                String blockTypesRaw = portalConfigSection.getString("triggerblock");
+
+                String[] blockTypesString = blockTypesRaw != null ? blockTypesRaw.split(",") : null;
 
                 HashSet<Material> blockTypes = getMaterialSet(blockTypesString);
 
-                if(blockTypes.size() == 0) {
+                if(blockTypes.isEmpty()) {
                     blockTypes.add(Material.NETHER_PORTAL);
                 }
 
@@ -132,12 +134,15 @@ public class Portal {
     public static HashSet<Material> getMaterialSet(String[] blockTypesString) {
         HashSet<Material> blockTypes = new HashSet<>();
 
-        for(String blockType : blockTypesString) {
-            Material material = Material.getMaterial(blockType);
-            if(material != null) {
-                blockTypes.add(material);
+        if (blockTypesString != null) {
+            for(String blockType : blockTypesString) {
+                Material material = Material.getMaterial(blockType);
+                if(material != null) {
+                    blockTypes.add(material);
+                }
             }
         }
+
         return blockTypes;
     }
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 1af1772..38a8537 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: com.sekwah.advancedportals.AdvancedPortalsPlugin
 name: AdvancedPortals
-version: 0.2.0
+version: 0.2.1
 author: sekwah41
 description: An advanced portals plugin for bukkit.
 api-version: 1.13