From de76801757add24e167eb8c8d19fb4e8706706d2 Mon Sep 17 00:00:00 2001
From: Driftay <saser_elite@yahoo.com>
Date: Tue, 6 Aug 2019 07:20:53 -0400
Subject: [PATCH] NPE Fixed in Vault & Updated Maven Plugins

---
 pom.xml                                                       | 4 ++--
 .../massivecraft/factions/zcore/persist/MemoryFPlayer.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b49ff25..9b92f543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -37,7 +37,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.2.1</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
index 0bd4a189..55741351 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
@@ -1232,7 +1232,7 @@ public abstract class MemoryFPlayer implements FPlayer {
 		}
 
 		// Was an over claim
-		if (currentFaction.isNormal() && currentFaction.hasLandInflation()) {
+		if (mustPay && currentFaction.isNormal() && currentFaction.hasLandInflation()) {
 			// Give them money for over claiming.
 			Econ.modifyMoney(payee, Conf.econOverclaimRewardMultiplier, TL.CLAIM_TOOVERCLAIM.toString(), TL.CLAIM_FOROVERCLAIM.toString());
 		}