Skip to content

Commit 94979a3

Browse files
author
games647
committed
Fix reading username with 1.19 and Floodgate
Related TuxCoding#856
1 parent 564f713 commit 94979a3

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ManualNameChange.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ public static void register(FastLoginBukkit plugin, FloodgateService floodgate)
7171
@Override
7272
public void onPacketReceiving(PacketEvent packetEvent) {
7373
PacketContainer packet = packetEvent.getPacket();
74-
WrappedGameProfile originalProfile = packet.getGameProfiles().read(0);
74+
String username = readUsername(packet);
7575

76-
if (floodgate.getBedrockPlayer(originalProfile.getName()) == null) {
76+
if (floodgate.getBedrockPlayer(username) == null) {
7777
//not a Floodgate player, no need to add a prefix
7878
return;
7979
}
8080

81-
packet.setMeta("original_name", originalProfile.getName());
82-
String prefixedName = FloodgateApi.getInstance().getPlayerPrefix() + originalProfile.getName();
81+
packet.setMeta("original_name", username);
82+
String prefixedName = FloodgateApi.getInstance().getPlayerPrefix() + username;
8383
setUsername(packet, prefixedName);
8484
}
8585

@@ -91,4 +91,12 @@ private void setUsername(PacketContainer packet, String name) {
9191
packet.getStrings().write(0, name);
9292
}
9393
}
94+
95+
private String readUsername(PacketContainer packet) {
96+
if (packet.getGameProfiles().size() > 0) {
97+
return packet.getGameProfiles().read(0).getName();
98+
} else {
99+
return packet.getStrings().read(0);
100+
}
101+
}
94102
}

0 commit comments

Comments
 (0)