diff --git a/plugin.yml b/plugin.yml index 12112aa..f77f13d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -2,7 +2,7 @@ name: GriefPrevention main: me.ryanhamshire.GriefPrevention.GriefPrevention softdepend: [Vault, Multiverse-Core, My Worlds, MystCraft, Transporter] dev-url: http://dev.bukkit.org/server-mods/grief-prevention -version: 8.1.3 +version: 8.1.4 commands: abandonclaim: description: Deletes a claim. diff --git a/src/me/ryanhamshire/GriefPrevention/Claim.java b/src/me/ryanhamshire/GriefPrevention/Claim.java index e5936a6..23891ef 100644 --- a/src/me/ryanhamshire/GriefPrevention/Claim.java +++ b/src/me/ryanhamshire/GriefPrevention/Claim.java @@ -356,8 +356,8 @@ public class Claim //anyone with explicit build permission can make changes if(this.hasExplicitPermission(player, ClaimPermission.Build)) return null; - //also everyone is a member of the "public", so check for public permission, indicated by a null key - ClaimPermission permissionLevel = this.playerIDToClaimPermissionMap.get(null); + //also everyone is a member of the "public", so check for public permission + ClaimPermission permissionLevel = this.playerIDToClaimPermissionMap.get("public"); if(ClaimPermission.Build == permissionLevel) return null; //subdivision permission inheritance diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index f6b24e4..5a4e298 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -682,6 +682,8 @@ public class GriefPrevention extends JavaPlugin catch(Exception e) { GriefPrevention.AddLogEntry("Because there was a problem with the database, GriefPrevention will not function properly. Either update the database config settings resolve the issue, or delete those lines from your config.yml so that GriefPrevention can use the file system to store data."); + GriefPrevention.AddLogEntry(e.getMessage()); + e.printStackTrace(); return; } } @@ -2143,17 +2145,14 @@ public class GriefPrevention extends JavaPlugin private OfflinePlayer resolvePlayerByName(String name) { //try online players first - OfflinePlayer [] players = this.getServer().getOnlinePlayers(); - for(int i = 0; i < players.length; i++) - { - if(players[i].getName().equalsIgnoreCase(name)) - { - return players[i]; - } - } + Player targetPlayer = this.getServer().getPlayerExact(name); + if(targetPlayer != null) return targetPlayer; - //then search offline players - players = this.getServer().getOfflinePlayers(); + targetPlayer = this.getServer().getPlayer(name); + if(targetPlayer != null) return targetPlayer; + + //then search offline players + OfflinePlayer [] players = this.getServer().getOfflinePlayers(); for(int i = 0; i < players.length; i++) { if(players[i].getName().equalsIgnoreCase(name))