diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java index c9acbc756..b84353929 100644 --- a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java +++ b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java @@ -21,7 +21,7 @@ * The data-object for a challenge */ public class Challenge { - public static final Pattern REQ_PATTERN = Pattern.compile("(?[0-9]+)(:(?[0-9]+))?:(?[0-9]+)(;(?[+\\-*])(?[0-9]+))\\s*?(?\\{.*\\})?"); + public static final Pattern REQ_PATTERN = Pattern.compile("(?[0-9]+)(:(?[0-9]+))?:(?[0-9]+)(;(?[+\\-*])(?[0-9]+))?\\s*(?\\{.*\\})?"); public static final int MAX_DETAILS = 11; public enum Type { PLAYER, ISLAND, ISLAND_LEVEL; diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/signs/SignLogic.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/signs/SignLogic.java index 05ae34aed..ad75102ac 100644 --- a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/signs/SignLogic.java +++ b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/signs/SignLogic.java @@ -123,6 +123,9 @@ public void updateSigns(final Location... containerLocations) { @Override public void run() { for (Location loc : containerLocations) { + if (loc == null) { + continue; + } long x1 = (long) Math.floor(loc.getX()); long x2 = Math.round(loc.getX()); long z1 = (long) Math.floor(loc.getZ()); diff --git a/uSkyBlock-Core/src/main/po/de.po b/uSkyBlock-Core/src/main/po/de.po index 3ca09e872..c690968a4 100644 --- a/uSkyBlock-Core/src/main/po/de.po +++ b/uSkyBlock-Core/src/main/po/de.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: 1.5\n" @@ -20,7 +20,6 @@ msgstr "" "X-Loco-Parser: loco_parse_po\n" "X-Loco-Target-Locale: zz_ZZ\n" "X-Generator: Poedit 1.8.8\n" -"POT-Creation-Date: \n" #, java-format msgid "§4Requirements will reset in {0} days." diff --git a/uSkyBlock-Core/src/main/po/en_GB.po b/uSkyBlock-Core/src/main/po/en_GB.po index e8f3bf238..21515c0c3 100644 --- a/uSkyBlock-Core/src/main/po/en_GB.po +++ b/uSkyBlock-Core/src/main/po/en_GB.po @@ -2,12 +2,11 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: \n" "PO-Revision-Date: 2016-07-05 23:28+0100\n" "Last-Translator: dutchy1001\n" "Language-Team: dutchy1001\n" @@ -2590,30 +2589,3 @@ msgstr "s" #, java-format msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" - -#~ msgid "§4Sorry!§e A protect-all is already running. Let it complete first." -#~ msgstr "" -#~ "§4* Sorry!§7 A protect-all is already running. Let it complete first." - -#~ msgid "§cPURGE:§9 Purged {0}/{1} {2,number,###}%" -#~ msgstr "§4* PURGE§7: Purged {0}/{1} {2,number,###}%" - -#~ msgid "§eConverted " -#~ msgstr "§4* §7Converted " - -#~ msgid "§a§lIsland Help" -#~ msgstr "§a§lIsland Help" - -#~ msgid "" -#~ "Need help with skyblock\n" -#~ "concepts or commands? View\n" -#~ "details about them here.\n" -#~ "§e§lClick here for help!" -#~ msgstr "" -#~ "Need help with skyblock\n" -#~ "concepts or commands? View\n" -#~ "details about them here.\n" -#~ "§e§lClick here for help!" - -#~ msgid "§4You are not part of an island. Returning you the spawn area!" -#~ msgstr "§4* §7You are not part of an island. Returning you the spawn area!" diff --git a/uSkyBlock-Core/src/main/po/nl.po b/uSkyBlock-Core/src/main/po/nl.po index 9d613d2aa..0d4c163f6 100644 --- a/uSkyBlock-Core/src/main/po/nl.po +++ b/uSkyBlock-Core/src/main/po/nl.po @@ -2,7 +2,6 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: \n" "PO-Revision-Date: 2016-07-05 22:53+0100\n" "Last-Translator: dutchy1001\n" "Language-Team: Debocraft\n" @@ -2605,32 +2604,3 @@ msgstr "s" #, java-format msgid "{0,number,0}:{1,number,00}.{2,number,000}" msgstr "{0,number,0}:{1,number,00}.{2,number,000}" - -#~ msgid "§4Sorry!§e A protect-all is already running. Let it complete first." -#~ msgstr "" -#~ "§4Sorry!§e Een Protect-all wordt al uitgevoerd. Laat het eerst voltooien." - -#~ msgid "§cPURGE:§9 Purged {0}/{1} {2,number,###}%" -#~ msgstr "§cVERWIJDER:§9 Verwijderd {0}/{1} {2,number,###}%" - -#~ msgid "§eConverted " -#~ msgstr "§eConverted " - -#~ msgid "§a§lIsland Help" -#~ msgstr "§a§lEiland Help" - -#~ msgid "" -#~ "Need help with skyblock\n" -#~ "concepts or commands? View\n" -#~ "details about them here.\n" -#~ "§e§lClick here for help!" -#~ msgstr "" -#~ "Help nodig met skyblock\n" -#~ "concept of commando's?\n" -#~ "Bekijk details over hen hier.\n" -#~ "§e§lKlik hier voor hulp!" - -#~ msgid "§4You are not part of an island. Returning you the spawn area!" -#~ msgstr "" -#~ "§4Je maakt geen deel uit van een eiland. Je word naar de spawn terug " -#~ "gestuurd!"