Merge pull request #2242 from Nightfirecat/coordinate-clue-wording-fix

Allow "degree" and "minute" in coordinate clues
This commit is contained in:
Tomas Slusny
2018-05-03 10:09:08 +02:00
committed by GitHub

View File

@@ -414,6 +414,7 @@ public class ClueScrollPlugin extends Plugin
/** /**
* Example input: "00 degrees 00 minutes north 07 degrees 13 minutes west" * Example input: "00 degrees 00 minutes north 07 degrees 13 minutes west"
* Note: some clues use "1 degree" instead of "01 degrees"
*/ */
private CoordinateClue coordinatesToWorldPoint(String text) private CoordinateClue coordinatesToWorldPoint(String text)
{ {
@@ -425,7 +426,7 @@ public class ClueScrollPlugin extends Plugin
return null; return null;
} }
if (!splitText[1].equals("degrees") || !splitText[3].equals("minutes")) if (!splitText[1].startsWith("degree") || !splitText[3].startsWith("minute"))
{ {
log.warn("\"" + text + "\" is not a well formed coordinate string"); log.warn("\"" + text + "\" is not a well formed coordinate string");
return null; return null;