Altitude/AlttdGriefPrevention
5
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Faster "trust" family commands.

Browse Source 
Accomplished by NOT searching offline players except for /untrust.
This commit is contained in:
ryanhamshire committed 2014-10-09 14:54:43 -07:00
1 parent 50cfbb7aec
commit 7c1b4ca32a
1 file changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+10 -7
View File
@@ -939,7 +939,7 @@ public class GriefPrevention extends JavaPlugin
return true; return true;
} }
OfflinePlayer targetPlayer = this.resolvePlayerByName(args[0]); OfflinePlayer targetPlayer = this.resolvePlayerByName(args[0], true);
if(targetPlayer == null) if(targetPlayer == null)
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound);
@@ -1076,7 +1076,7 @@ public class GriefPrevention extends JavaPlugin
//validate player argument or group argument //validate player argument or group argument
if(!args[0].startsWith("[") || !args[0].endsWith("]")) if(!args[0].startsWith("[") || !args[0].endsWith("]"))
{ {
otherPlayer = this.resolvePlayerByName(args[0]); otherPlayer = this.resolvePlayerByName(args[0], true);
if(!clearPermissions && otherPlayer == null && !args[0].equals("public")) if(!clearPermissions && otherPlayer == null && !args[0].equals("public"))
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound);
@@ -1507,7 +1507,7 @@ public class GriefPrevention extends JavaPlugin
if(args.length != 1) return false; if(args.length != 1) return false;
//try to find that player //try to find that player
OfflinePlayer otherPlayer = this.resolvePlayerByName(args[0]); OfflinePlayer otherPlayer = this.resolvePlayerByName(args[0], true);
if(otherPlayer == null) if(otherPlayer == null)
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound);
@@ -1557,7 +1557,7 @@ public class GriefPrevention extends JavaPlugin
//otherwise try to find the specified player //otherwise try to find the specified player
else else
{ {
otherPlayer = this.resolvePlayerByName(args[0]); otherPlayer = this.resolvePlayerByName(args[0], true);
if(otherPlayer == null) if(otherPlayer == null)
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound);
@@ -1698,7 +1698,7 @@ public class GriefPrevention extends JavaPlugin
} }
//otherwise, find the specified player //otherwise, find the specified player
OfflinePlayer targetPlayer = this.resolvePlayerByName(args[0]); OfflinePlayer targetPlayer = this.resolvePlayerByName(args[0], true);
if(targetPlayer == null) if(targetPlayer == null)
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound);
@@ -1996,7 +1996,7 @@ public class GriefPrevention extends JavaPlugin
else else
{ {
otherPlayer = this.resolvePlayerByName(recipientName); otherPlayer = this.resolvePlayerByName(recipientName, false);
if(otherPlayer == null && !recipientName.equals("public") && !recipientName.equals("all")) if(otherPlayer == null && !recipientName.equals("public") && !recipientName.equals("all"))
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound);
@@ -2141,7 +2141,7 @@ public class GriefPrevention extends JavaPlugin
} }
//helper method to resolve a player by name //helper method to resolve a player by name
private OfflinePlayer resolvePlayerByName(String name) private OfflinePlayer resolvePlayerByName(String name, boolean searchOffline)
{ {
//try online players first //try online players first
Player targetPlayer = this.getServer().getPlayerExact(name); Player targetPlayer = this.getServer().getPlayerExact(name);
@@ -2150,6 +2150,8 @@ public class GriefPrevention extends JavaPlugin
targetPlayer = this.getServer().getPlayer(name); targetPlayer = this.getServer().getPlayer(name);
if(targetPlayer != null) return targetPlayer; if(targetPlayer != null) return targetPlayer;
if(searchOffline)
{
//then search offline players //then search offline players
OfflinePlayer [] players = this.getServer().getOfflinePlayers(); OfflinePlayer [] players = this.getServer().getOfflinePlayers();
for(int i = 0; i < players.length; i++) for(int i = 0; i < players.length; i++)
@@ -2158,6 +2160,7 @@ public class GriefPrevention extends JavaPlugin
{ {
return players[i]; return players[i];
} }
}
} }
//if none found, return null //if none found, return null