From e7ed9465e22e77f1c2f9830e186d7b53890351ca Mon Sep 17 00:00:00 2001
From: randombyte-developer <apps.randombyte@gmail.com>
Date: Thu, 24 May 2018 16:27:21 +0200
Subject: [PATCH] Added new placeholder 'user'

---
 .../impl/placeholder/Defaults.java            | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/me/rojo8399/placeholderapi/impl/placeholder/Defaults.java b/src/main/java/me/rojo8399/placeholderapi/impl/placeholder/Defaults.java
index 5b92a28..bddc966 100644
--- a/src/main/java/me/rojo8399/placeholderapi/impl/placeholder/Defaults.java
+++ b/src/main/java/me/rojo8399/placeholderapi/impl/placeholder/Defaults.java
@@ -619,10 +619,28 @@ public void newEco(ChangeServiceProviderEvent event) {
 		}
 	}
 
+	@Placeholder(id = "user")
+	public Object user(@Source User user, @Token(fix = true) @Nullable String token) throws NoValueException {
+		if (token == null) {
+			return user.getName();
+		}
+
+		switch (token) {
+			case "name":
+				return user.getName();
+			case "displayname":
+				return user.getOrElse(Keys.DISPLAY_NAME, Text.of(user.getName()));
+			case "uuid":
+				return user.getUniqueId();
+		}
+
+		throw new NoValueException();
+	}
+
 	@Placeholder(id = "player")
 	public Object normalPlayer(@Source Player p, @Token(fix = true) @Nullable String token) throws NoValueException {
 		if (token == null) {
-			return p.getName();
+			return user(p, null);
 		}
 		if (token.startsWith("option_")) {
 			String op = token.substring("option_".length());
@@ -636,12 +654,6 @@ public Object normalPlayer(@Source Player p, @Token(fix = true) @Nullable String
 		case "prefix":
 		case "suffix":
 			return p.getOption(token).orElse("");
-		case "name":
-			return p.getName();
-		case "displayname":
-			return p.getOrElse(Keys.DISPLAY_NAME, Text.of(p.getName()));
-		case "uuid":
-			return p.getUniqueId();
 		case "can_fly":
 			return p.getOrElse(Keys.CAN_FLY, false);
 		case "world":
@@ -730,9 +742,9 @@ public Object normalPlayer(@Source Player p, @Token(fix = true) @Nullable String
 				out += f.format(s) + " s";
 			}
 			return out.trim();
-		default:
-			throw new NoValueException();
 		}
+
+		return user(p, token);
 	}
 
 	@Listener