Add support for customized(persona) skin between bedrock players #5833
Conversation
|
It was always intentional to let Floodgate override the skin of the player, as that'd be the skin that every other player would see. |
onebeastchris
left a comment
onebeastchris
left a comment
There was a problem hiding this comment.
Only a partial review, i personally think this could be interesting.
This PR, as-is, wouldn't call the SessionSkinApplyEvent for Bedrock player skins. This isn't acceptable; but to properly enable this we would need to add a way to represent persona skins in API somehow... assuming we want that.
What i would also be fine with would be to call the fetch the skin how it's currently done, and only after the event has been called, check whether the skin is unchanged (aka, matches the converted Floodgate skin) and to send the persona skin in its place.
However, it should always be possible for an API user / the backend server to send a skin that would override the player's own set skin
| /** | ||
| * Method to determine if the given online player is a linked Bedrock player. | ||
| * | ||
| * @param uuid the uuid of the online player | ||
| * @return true if the given online player is a Bedrock player | ||
| */ | ||
| boolean isLinkedPlayer(@NonNull UUID uuid); | ||
|
|
There was a problem hiding this comment.
pls remove, don't want to introduce this API at the moment until the merge
| public boolean isLinked() { | ||
| return false; //todo | ||
| // Java and linked players' uuid version is 4, while bedrock is 0 | ||
| return this.javaUuid().version() == 4; |
There was a problem hiding this comment.
With local linking this isn't necessarily true.. might be easier to check if the uuid isn't version 0?
| SkinGeometry geometry = data.isAlex() ? SkinGeometry.SLIM : SkinGeometry.WIDE; | ||
| if (skin != null) { | ||
| serializedSkin = getSerializedSkin(skin, cape ,geometry); | ||
| } |
There was a problem hiding this comment.
Not a fan of always assuming that the skin should always be overridden... e.g. there are plugins/mods that send a different skin for a player, that should always take priority.
| Cape cape = SkinProvider.getCachedCape(data.capeUrl()); | ||
| SkinGeometry geometry = data.isAlex() ? SkinGeometry.SLIM : SkinGeometry.WIDE; | ||
| if (skin != null) { | ||
| serializedSkin = getSerializedSkin(skin, cape ,geometry); |
There was a problem hiding this comment.
| serializedSkin = getSerializedSkin(skin, cape ,geometry); | |
| serializedSkin = getSerializedSkin(skin, cape, geometry); |
| } | ||
|
|
||
| private static SerializedSkin getSkin(GeyserSession session, String skinId, Skin skin, Cape cape, SkinGeometry geometry) { | ||
| public static SerializedSkin getSerializedSkin(SkinData skinData) { |
| .fullSkinId(skinId) | ||
| .geometryDataEngineVersion(session.getClientData().getGameVersion()) | ||
| .fullSkinId(skin.textureUrl()) | ||
| .geometryDataEngineVersion("0.0.0") |
There was a problem hiding this comment.
I hava tested it locally, finding that client sends "0.0.0" for classic skins. This may be insensitive.
|
Got it. We should provide floodgate with the skins and let it determine which to apply, but we currently lack a bridge to send persona skins to floodgate, and floodgate doesn't have the ability to handle it now. |
|
There's no need to send skins to floodgate; that's already sort of a thing with skin uploading - Geyser uploads the login data including skin to the Global API, which from there sends it to Floodgate Point is; what you'd need is a way to tell if a skin sent from the backend server is actually a converted floodgate skin or not. If it is a converted skin, using the persona skin is okay; if it's not the server supplied skin should take prio |
|
Will it be feasible to judge by texture url? Converted skin directs to Global API. As for using property to indicate that may cause problems when texture is modified by other java plugins. |
3 participants
Bedrock customized(persona) skins were ignored in previous version, leading to problems such as #4194, #4195, #5253, etc. When joining, Floodgate uploads and applies skin slightly after own skin data sent, so players couldn't see their own skin while others could. And, the skin captured from persona skin were incomplete. This PR completes the processing of persona skin, using client-sent skin instead of floodgate-uploaded skin for bedrock players. Now, bedrock players should see others' skin as in a native bedrock server; for Java players, customized skins still have display problems as before. It's worth mentioning that skins in Velocity still left partially broken, since it doesn't allow Floodgate to apply skin after joining game.