EssentialsX#413 Now checks the papi version when using old version an…

…d update to latest - Last commit fix for offlineplayer, we not using this
moker59 · May 8, 2019 · afb07a6 · afb07a6
1 parent 2147c27
commit afb07a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -124,7 +124,7 @@
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.9.2</version>
+			<version>2.10.1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java
@@ -227,7 +227,8 @@ public Placeholder getPlaceholderAPIManager() {
     private boolean setupPlaceHolderAPI() {
 	if (!getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
 	    return false;
-	if (!getServer().getPluginManager().getPlugin("PlaceholderAPI").getDescription().getVersion().contains("2.10.0")) {
+	if (getVersionCheckManager().convertVersion(getServer().getPluginManager()
+		    .getPlugin("PlaceholderAPI").getDescription().getVersion()) >= getVersionCheckManager().convertVersion("2.10.0")) {
 	    if ((new NewPlaceholderAPIHook(this)).register())
 		consoleMsg("&e[Jobs] PlaceholderAPI hooked.");
 	} else {

diff --git a/src/main/java/com/gamingmesh/jobs/Placeholders/NewPlaceholderAPIHook.java b/src/main/java/com/gamingmesh/jobs/Placeholders/NewPlaceholderAPIHook.java
@@ -1,6 +1,6 @@
 package com.gamingmesh.jobs.Placeholders;
 
-import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.Placeholders.Placeholder.JobsPlaceHolders;
@@ -16,7 +16,7 @@ public NewPlaceholderAPIHook(Jobs plugin) {
     }
 
     @Override
-    public String onRequest(OfflinePlayer player, String identifier) {
+    public String onPlaceholderRequest(Player player, String identifier) {
 	JobsPlaceHolders placeHolder = JobsPlaceHolders.getByName(identifier);
 	if (placeHolder == null)
 	    return null;

diff --git a/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java b/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java
@@ -6,7 +6,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.gamingmesh.jobs.Jobs;
@@ -333,18 +332,10 @@ private String translateOwnPlaceHolder(Player player, String message) {
 	return message;
     }
 
-    public String getValue(OfflinePlayer player, JobsPlaceHolders placeHolder) {
-	return getValue(player.getPlayer(), placeHolder, null);
-    }
-
     public String getValue(Player player, JobsPlaceHolders placeHolder) {
 	return getValue(player, placeHolder, null);
     }
 
-    public String getValue(OfflinePlayer player, JobsPlaceHolders placeHolder, String value) {
-	return getValue(player != null ? player.getUniqueId() : null, placeHolder, value);
-    }
-
     public String getValue(Player player, JobsPlaceHolders placeHolder, String value) {
 	return getValue(player != null ? player.getUniqueId() : null, placeHolder, value);
     }