Upstream/AreaShop
1
0
Fork 0
mirror of https://github.com/NLthijs48/AreaShop.git synced 2024-11-16 15:25:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix using landlordName setting without using landlord (uuid) setting

Browse Source
This commit is contained in:
Thijs Wiefferink 2017-02-02 17:20:26 +01:00
parent 6b8e161e43
commit 40d45c7786
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AreaShop/src/main/java/me/wiefferink/areashop/regions/GeneralRegion.java
View File

@ -398,13 +398,20 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
*/ */
public UUID getLandlord() { public UUID getLandlord() {
String landlord = getStringSetting("general.landlord"); String landlord = getStringSetting("general.landlord");
if(landlord != null) { if(landlord != null && !landlord.isEmpty()) {
try { try {
return UUID.fromString(landlord); return UUID.fromString(landlord);
} catch(IllegalArgumentException e) { } catch(IllegalArgumentException e) {
// Incorrect UUID // Incorrect UUID
} }
} }
String landlordName = getStringSetting("general.landlordName");
if(landlordName != null && !landlordName.isEmpty()) {
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(landlordName);
if(offlinePlayer != null) {
return offlinePlayer.getUniqueId();
}
}
return null; return null;
} }