summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-12-20 12:20:12 +0100
committersnowleo <schneeleo@gmail.com>2011-12-20 12:20:12 +0100
commit5d4f22ad84ff075c02dc29384edc030c23f89f7b (patch)
tree7a1e7d6842a2b285fc57a97b2e6ef77abb8f59ec
parent31e80ba698e29d88be97aeaae87ecbd189cb1ea8 (diff)
downloadEssentials-5d4f22ad84ff075c02dc29384edc030c23f89f7b.tar
Essentials-5d4f22ad84ff075c02dc29384edc030c23f89f7b.tar.gz
Essentials-5d4f22ad84ff075c02dc29384edc030c23f89f7b.tar.lz
Essentials-5d4f22ad84ff075c02dc29384edc030c23f89f7b.tar.xz
Essentials-5d4f22ad84ff075c02dc29384edc030c23f89f7b.zip
Correctly match release and non release versions of bukkit.
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index c8152248e..a80b3685a 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -123,7 +123,7 @@ public class Essentials extends JavaPlugin implements IEssentials
LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
}
}
- final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-b([0-9]+)jnks.*").matcher(getServer().getVersion());
+ final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
if (versionMatch.matches())
{
final int versionNumber = Integer.parseInt(versionMatch.group(4));