Merge pull request #37 from Andre601/feature/improve-build-placeholder

Try and fix the paper build.

Author: iGabyTM

src/main/java/com/extendedclip/papi/expansion/server/ServerExpansion.java

@@ -150,6 +150,7 @@ public String onRequest(OfflinePlayer p, String identifier) {
 			case "build":
 				return ServerUtils.BUILD;
 			case "version_build":
+			case "version_full":
 				return ServerUtils.VERSION + '-' + ServerUtils.BUILD;
 			// -----
 

src/main/java/com/extendedclip/papi/expansion/server/ServerUtils.java

@@ -2,16 +2,23 @@
 
 import org.bukkit.Bukkit;
 
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.Map;
 
 public final class ServerUtils {
 
     public static final String VERSION = Bukkit.getBukkitVersion().split("-")[0];
     public static final String BUILD;
+    
+    private static final Map<String, String> variants = new HashMap<>();
 
     static {
         boolean isPaper = false;
+        variants.put("Purpur", "net.pl3x.purpur.PurpurConfig");
+        variants.put("Airplane", "gg.airplane.AirplaneConfig");
+        variants.put("Tuinity", "com.tuinity.tuinity.config.TuinityConfig");
+        variants.put("Paper", "com.destroystokyo.paper.PaperConfig");
+        variants.put("Spigot", "org.spigotmc.SpigotConfig");
 
         try {
             Class.forName("com.destroystokyo.paper.PaperConfig");
@@ -21,22 +28,15 @@ public final class ServerUtils {
         String[] buildParts = Bukkit.getVersion().split("-");
 
         if (buildParts.length >= 3) {
-            BUILD = isPaper ? buildParts[2] : buildParts[0];
+            BUILD = isPaper ? buildParts[2].substring(0, buildParts[2].indexOf(" ")) : buildParts[0];
         } else {
             BUILD = "UNKNOWN";
         }
     }
 
     private ServerUtils() { }
 
-    @SuppressWarnings("SpellCheckingInspection")
     public static String getServerVariant() {
-        final Map<String, String> variants = new LinkedHashMap<>();
-        variants.put("Purpur", "net.pl3x.purpur.PurpurConfig");
-        variants.put("Airplane", "gg.airplane.AirplaneConfig");
-        variants.put("Tuinity", "com.tuinity.tuinity.config.TuinityConfig");
-        variants.put("Paper", "com.destroystokyo.paper.PaperConfig");
-        variants.put("Spigot", "org.spigotmc.SpigotConfig");
 
         for (Map.Entry<String, String> variant : variants.entrySet()) {
             try {