Merge pull request #5273 from TownyAdvanced/feature/resident-isonline

Add Resident#isOnline
TownyAdvanced · Sep 12, 2021 · b8de0eb · b8de0eb
2 parents 09206df + 3e228aa
commit b8de0eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/com/palmergames/bukkit/towny/object/Resident.java b/src/com/palmergames/bukkit/towny/object/Resident.java
@@ -535,7 +535,7 @@ public Player getPlayer() {
 	public boolean addTownRank(String rank) {
 		if (!hasTownRank(rank)) {
 			townRanks.add(rank);
-			if (BukkitTools.isOnline(this.getName()))
+			if (isOnline())
 				TownyPerms.assignPermissions(this, null);
 			BukkitTools.getPluginManager().callEvent(new TownAddResidentRankEvent(this, rank, town));
 			return true;
@@ -571,7 +571,7 @@ public boolean removeTownRank(String rank) {
 
 		if (hasTownRank(rank)) {
 			townRanks.remove(rank);
-			if (BukkitTools.isOnline(this.getName()))
+			if (isOnline())
 				TownyPerms.assignPermissions(this, null);
 
 			BukkitTools.getPluginManager().callEvent(new TownRemoveResidentRankEvent(this, rank, town));
@@ -585,7 +585,7 @@ public boolean addNationRank(String rank) {
 
 		if (!hasNationRank(rank)) {
 			nationRanks.add(rank);
-			if (BukkitTools.isOnline(this.getName()))
+			if (isOnline())
 				TownyPerms.assignPermissions(this, null);
 			return true;
 		}
@@ -835,6 +835,10 @@ public Nation getNationOrNull() {
 		else
 			return null;
 	}
+
+	public boolean isOnline() {
+		return BukkitTools.isOnline(getName());
+	}
 
 	/**
 	 * @deprecated As of 0.96.0.0+ please use {@link EconomyAccount#getWorld()} instead.

diff --git a/src/com/palmergames/bukkit/util/BukkitTools.java b/src/com/palmergames/bukkit/util/BukkitTools.java
@@ -120,15 +120,11 @@ public static Player getPlayer(UUID playerUUID) {
 	/**
 	 * Tests if this player is online.
 	 * 
-	 * @param playerId the UUID or name of the player.
+	 * @param name the name of the player.
 	 * @return a true value if online
 	 */
-	public static boolean isOnline(String playerId) {
-		for (Player players : getOnlinePlayers()) {
-			if (players.getName().equals(playerId))
-				return true;
-		}
-		return false; 
+	public static boolean isOnline(String name) {
+		return Bukkit.getPlayer(name) != null;
 	}
 
 	public static List<World> getWorlds() {