GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Handle NonNull in SessionSkinApplyEvent

This commit is contained in:
rtm516 2024-05-05 19:17:35 +01:00
parent 46f19dd6f7
commit 77750cc8b1
No known key found for this signature in database
GPG Key ID: 331715B8B007C67A
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionSkinApplyEvent.java
View File

@ -62,7 +62,7 @@ public abstract class SessionSkinApplyEvent extends ConnectionEvent {
*
* @return the username of the player
*/
public String username() {
public @NonNull String username() {
return username;
}
@ -71,7 +71,7 @@ public abstract class SessionSkinApplyEvent extends ConnectionEvent {
*
* @return the UUID of the player
*/
public UUID uuid() {
public @NonNull UUID uuid() {
return uuid;
}
@ -98,16 +98,16 @@ public abstract class SessionSkinApplyEvent extends ConnectionEvent {
*
* @return the original skin data of the player
*/
public SkinData originalSkin() {
public @NonNull SkinData originalSkin() {
return originalSkinData;
}
/**
* The skin data of the player.
*
* @return the skin data of the player
* @return the current skin data of the player
*/
public abstract SkinData skinData();
public abstract @NonNull SkinData skinData();
/**
* Change the skin of the player.

6
core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java
View File

@ -271,17 +271,17 @@ public class SkinProvider {
@Override
public void skin(@NonNull Skin newSkin) {
eventSkinData.skinData(new SkinData(newSkin, skinData.cape(), skinData.geometry()));
eventSkinData.skinData(new SkinData(Objects.requireNonNull(newSkin), skinData.cape(), skinData.geometry()));
}
@Override
public void cape(@NonNull Cape newCape) {
eventSkinData.skinData(new SkinData(skinData.skin(), newCape, skinData.geometry()));
eventSkinData.skinData(new SkinData(skinData.skin(), Objects.requireNonNull(newCape), skinData.geometry()));
}
@Override
public void geometry(@NonNull SkinGeometry newGeometry) {
eventSkinData.skinData(new SkinData(skinData.skin(), skinData.cape(), newGeometry));
eventSkinData.skinData(new SkinData(skinData.skin(), skinData.cape(), Objects.requireNonNull(newGeometry)));
}
});

2
gradle.properties
View File

@ -7,5 +7,5 @@ org.gradle.vfs.watch=false
group=org.geysermc
id=geyser
version=2.2.4-SNAPSHOT
version=2.3.1-SNAPSHOT
description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.