Skip to content

Commit 689ae51

Browse files
committed
chore: merge api-12 for updates
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
2 parents 45e646d + 3d0fc67 commit 689ae51

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

gradle/verification-metadata.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<configuration>
44
<verify-metadata>true</verify-metadata>
55
<verify-signatures>false</verify-signatures>
6+
<trusted-artifacts>
7+
<trust file=".*-javadoc[.]jar" regex="true"/>
8+
<trust file=".*-sources[.]jar" regex="true"/>
9+
</trusted-artifacts>
610
</configuration>
711
<components>
812
<component group="aopalliance" name="aopalliance" version="1.0">

src/main/java/org/spongepowered/api/data/type/HandPreference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@
3636
* <p>For players, this is controlled by the left hand/right hand setting</p>
3737
*/
3838
@CatalogedBy(HandPreferences.class)
39-
public interface HandPreference extends DefaultedRegistryValue, ComponentLike {
39+
public interface HandPreference extends DefaultedRegistryValue, ComponentLike, StringRepresentable {
4040

4141
}

src/main/java/org/spongepowered/api/entity/living/player/server/ServerPlayer.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.spongepowered.api.event.Cause;
4848
import org.spongepowered.api.item.inventory.Container;
4949
import org.spongepowered.api.item.inventory.Inventory;
50+
import org.spongepowered.api.network.ServerConnectionState;
5051
import org.spongepowered.api.network.ServerSideConnection;
5152
import org.spongepowered.api.scoreboard.Scoreboard;
5253
import org.spongepowered.api.service.permission.Subject;
@@ -185,6 +186,14 @@ default SetValue.Mutable<SkinPart> displayedSkinParts() {
185186
*/
186187
ServerSideConnection connection();
187188

189+
/**
190+
* Gets the appropriate {@link ServerConnectionState.Game} linking this player to a
191+
* connection state.
192+
*
193+
* @return The connection state
194+
*/
195+
ServerConnectionState.Game connectionState();
196+
188197
/**
189198
* Gets this player's {@link TabList}.
190199
*

0 commit comments

Comments
 (0)