Skip to content

Commit 73d2ce5

Browse files
committed
rm displayname service pass uuid
1 parent f8bf206 commit 73d2ce5

4 files changed

Lines changed: 10 additions & 190 deletions

File tree

commons/src/main/java/net/swofty/commons/protocol/objects/player/GetDisplayNameProtocolObject.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

service.friend/src/main/java/net/swofty/service/friend/endpoints/GetDisplayNameEndpoint.java

Lines changed: 0 additions & 100 deletions
This file was deleted.

type.generic/src/main/java/net/swofty/type/generic/redis/service/RedisStaffBroadcast.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,16 @@ public JSONObject onMessage(JSONObject message) {
3030
StaffBroadcastProtocolObject.StaffBroadcastMessage msg =
3131
proto.getSerializer().deserialize(payload);
3232

33+
String resolvedName;
34+
try {
35+
resolvedName = net.swofty.type.generic.user.HypixelPlayer.getDisplayName(msg.sender());
36+
} catch (Exception e) {
37+
resolvedName = msg.senderName(); // fallback to provided name
38+
}
39+
3340
String serverLabel = msg.server() == null ? "" : msg.server();
3441
boolean showServer = !serverLabel.isBlank() && !"proxy".equalsIgnoreCase(serverLabel);
35-
String formatted = "§b[STAFF] §f" + msg.senderName()
42+
String formatted = "§b[STAFF] §f" + resolvedName
3643
+ (showServer ? " §7(" + serverLabel + ")" : "")
3744
+ "§f: " + msg.message();
3845

velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import net.swofty.commons.Configuration;
3737
import net.swofty.commons.ServerType;
3838
import net.swofty.commons.proxy.FromProxyChannels;
39-
import net.swofty.commons.protocol.objects.player.GetDisplayNameProtocolObject;
4039
import net.swofty.redisapi.api.RedisAPI;
4140
import net.swofty.velocity.command.ServerStatusCommand;
4241
import net.swofty.velocity.data.CoopDatabase;
@@ -399,20 +398,8 @@ private void sendStaffJoinLeave(Player player, boolean joined) {
399398
// Do not show server name in join/leave messages looks weird. Kept just so protocol doesnt break
400399
String serverName = "";
401400

402-
// fetch formatted name (rank prefix + ign) from friend service
403-
ServerOutboundMessage.sendMessageToService(
404-
ServiceType.FRIEND,
405-
new GetDisplayNameProtocolObject(),
406-
new GetDisplayNameProtocolObject.GetDisplayNameMessage(player.getUniqueId()),
407-
response -> {
408-
try {
409-
GetDisplayNameProtocolObject.GetDisplayNameResponse parsed =
410-
new GetDisplayNameProtocolObject().getReturnSerializer().deserialize(response);
411-
lastServerDisplay.put(player.getUniqueId(), parsed.displayName());
412-
} catch (Exception ignored) {}
413-
}
414-
);
415-
String displayName = lastServerDisplay.getOrDefault(player.getUniqueId(), player.getUsername());
401+
// Send UUID and a basic name
402+
String displayName = player.getUsername();
416403

417404
var proto = new net.swofty.commons.protocol.objects.staff.StaffBroadcastProtocolObject();
418405
String payload = proto.getSerializer().serialize(

0 commit comments

Comments
 (0)