From 169045839ed6c31e74bd48eb8ca2adbbf717dcaa Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Mon, 23 May 2016 18:49:33 +0200 Subject: [PATCH] Prepare the feature check for MC1.10 --- src/com/dre/brewery/Brew.java | 2 +- src/com/dre/brewery/P.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/dre/brewery/Brew.java b/src/com/dre/brewery/Brew.java index 505c381..daa4fae 100644 --- a/src/com/dre/brewery/Brew.java +++ b/src/com/dre/brewery/Brew.java @@ -280,7 +280,7 @@ public class Brew { // Do some regular updates public void touch() { - lastUpdate = (int) ((float) (System.currentTimeMillis() - installTime) / 3600000F); + lastUpdate = (int) ((double) (System.currentTimeMillis() - installTime) / 3600000D); } public int getDistillRuns() { diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index bc3c9e3..e01aa93 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -67,8 +67,8 @@ public class P extends JavaPlugin { // Version check String v = Bukkit.getBukkitVersion(); - useUUID = !v.matches(".*1\\.[0-6].*") && !v.matches(".*1\\.7\\.[0-5].*"); - use1_9 = !v.matches(".*1\\.[0-8].*"); + useUUID = !v.matches("(^|.*[^\\.\\d])1\\.[0-6]([^\\d].*|$)") && !v.matches("(^|.*[^\\.\\d])1\\.7\\.[0-5]([^\\d].*|$)"); + use1_9 = !v.matches("(^|.*[^\\.\\d])1\\.[0-8]([^\\d].*|$)"); // load the Config try {