Support for mcMMO 2.0.0

Zrips · Jan 29, 2019 · 1f1b9ee · 1f1b9ee
1 parent 92564ee
commit 1f1b9ee
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 880 deletions.
diff --git a/libs/mcMMO-1.5.05-SNAPSHOT.jar b/libs/mcMMO-1.5.05-SNAPSHOT.jar
diff --git a/libs/mcMMO.jar b/libs/mcMMO.jar
diff --git a/pom.xml b/pom.xml
@@ -31,9 +31,9 @@
 		<dependency>
 			<groupId>com.gmail.nossr50.mcMMO</groupId>
 			<artifactId>mcMMO</artifactId>
-			<version>1.5.05-SNAPSHOT</version>
+			<version>2.0.0</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/libs/mcMMO-1.5.05-SNAPSHOT.jar</systemPath>
+			<systemPath>${basedir}/libs/mcMMO.jar</systemPath>
 		</dependency>
 		<!-- Vault -->
 		<dependency>

diff --git a/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java b/src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
@@ -460,7 +460,7 @@ public boolean leaveJob(Job job) {
 //	synchronized (saveLock) {
 	JobProgression prog = getJobProgression(job);
 	if (prog != null) {
-	    progression.remove(prog);//TODO
+	    progression.remove(prog);
 	    reloadMaxExperience();
 	    reloadLimits();
 	    reloadHonorific();

diff --git a/src/main/java/com/gamingmesh/jobs/listeners/McMMOlistener.java b/src/main/java/com/gamingmesh/jobs/listeners/McMMOlistener.java
@@ -55,6 +55,9 @@ public void OnItemrepair(McMMOPlayerRepairCheckEvent event) {
 	    return;
 
 	JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
+	if (jPlayer == null)
+	    return;
+
 	Jobs.action(jPlayer, new ItemActionInfo(resultStack, ActionType.REPAIR));
     }
 
@@ -83,9 +86,8 @@ public double getMultiplier(Player player) {
 	    return 0D;
 
 	HashMap<AbilityType, Long> InfoMap = map.get(player.getName());
-	if (InfoMap == null) {
+	if (InfoMap == null)
 	    return 0D;
-	}
 
 	Long t = InfoMap.get(AbilityType.TREE_FELLER);
 	if (t != null) {

diff --git a/src/main/resources/LICENSE-Apache.txt b/src/main/resources/LICENSE-Apache.txt