MinecraftUtilities/Backend
1
1
Fork 1
Code Issues 1 Pull Requests 6 Actions Activity

fix issue if bad part name is given it shows the default head
Some checks failed
deploy / deploy (push) Failing after 35s
Details

Browse Source
This commit is contained in:
Lee 2024-04-08 07:37:22 +01:00
parent 88da585d47
commit 6144a2e1f6
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cc/fascinated/controller/PlayerController.java
View File

@ -2,6 +2,7 @@ package cc.fascinated.controller;
import cc.fascinated.model.player.Player; import cc.fascinated.model.player.Player;
import cc.fascinated.model.player.Skin; import cc.fascinated.model.player.Skin;
import cc.fascinated.model.response.impl.InvalidPartResponse;
import cc.fascinated.model.response.impl.PlayerNotFoundResponse; import cc.fascinated.model.response.impl.PlayerNotFoundResponse;
import cc.fascinated.service.PlayerService; import cc.fascinated.service.PlayerService;
import cc.fascinated.util.PlayerUtils; import cc.fascinated.util.PlayerUtils;
@ -39,7 +40,7 @@ public class PlayerController {
} }
@GetMapping(value = "/{part}/{id}") @GetMapping(value = "/{part}/{id}")
public ResponseEntity<byte[]> getPlayerHead(@PathVariable String part, public ResponseEntity<?> getPlayerHead(@PathVariable String part,
@PathVariable String id, @PathVariable String id,
@RequestParam(required = false, defaultValue = "250") int size) { @RequestParam(required = false, defaultValue = "250") int size) {
Player player = playerManagerService.getPlayer(id); Player player = playerManagerService.getPlayer(id);
@ -47,9 +48,10 @@ public class PlayerController {
if (player != null) { // The player exists if (player != null) { // The player exists
Skin skin = player.getSkin(); Skin skin = player.getSkin();
Skin.Parts skinPart = Skin.Parts.fromName(part); Skin.Parts skinPart = Skin.Parts.fromName(part);
if (skinPart != null) { // The part exists if (skinPart == null) { // Unknown part name
partBytes = PlayerUtils.getSkinPartBytes(skin, skinPart, size); return new InvalidPartResponse().toResponseEntity();
} }
partBytes = PlayerUtils.getSkinPartBytes(skin, skinPart, size);
} }
if (partBytes == null) { // Fallback to the default head if (partBytes == null) { // Fallback to the default head
partBytes = PlayerUtils.getSkinPartBytes(Skin.DEFAULT_SKIN, Skin.Parts.HEAD, size); partBytes = PlayerUtils.getSkinPartBytes(Skin.DEFAULT_SKIN, Skin.Parts.HEAD, size);

11
src/main/java/cc/fascinated/model/response/impl/InvalidPartResponse.java Normal file
View File

@ -0,0 +1,11 @@
package cc.fascinated.model.response.impl;
import cc.fascinated.model.response.Response;
import org.springframework.http.HttpStatus;
public class InvalidPartResponse extends Response {
public InvalidPartResponse() {
super(HttpStatus.NOT_FOUND, "Invalid part name.");
}
}