13
0
geforkt von Mirrors/Velocity

fix resource pack status

Dieser Commit ist enthalten in:
Gero 2023-12-07 13:51:32 +01:00 committet von Shane Freeder
Ursprung 519bf5ee04
Commit 058aee259a
2 geänderte Dateien mit 10 neuen und 2 gelöschten Zeilen

Datei anzeigen

@ -134,6 +134,10 @@ public class PlayerResourcePackStatusEvent {
* The player has accepted the resource pack and is now downloading it.
*/
ACCEPTED,
/**
* The player has downloaded the resource pack.
*/
DOWNLOADED,
/**
* The URL of the resource pack failed to load.
*/
@ -145,6 +149,10 @@ public class PlayerResourcePackStatusEvent {
/**
* The resource pack was discarded.
*/
DISCARDED,
DISCARDED;
public boolean isIntermediate() {
return this == ACCEPTED || this == DOWNLOADED;
}
}
}

Datei anzeigen

@ -1057,7 +1057,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
* Processes a client response to a sent resource-pack.
*/
public boolean onResourcePackResponse(PlayerResourcePackStatusEvent.Status status) {
final boolean peek = status == PlayerResourcePackStatusEvent.Status.ACCEPTED;
final boolean peek = status.isIntermediate();
final ResourcePackInfo queued = peek
? outstandingResourcePacks.peek() : outstandingResourcePacks.poll();