ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

feat: error handling on invalid skin/name

Browse source
This commit is contained in:
ineanto 2023-12-22 15:01:30 +01:00
parent 30803363ba
commit 3377dcf2bf
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java
View file

@ -114,15 +114,22 @@ public class AppearanceManager {
properties.get("textures").clear(); properties.get("textures").clear();
properties.put("textures", new WrappedSignedProperty("textures", skinResult.value(), skinResult.signature())); properties.put("textures", new WrappedSignedProperty("textures", skinResult.value(), skinResult.signature()));
} else { } else {
profile.setSkin(null);
dataStore.updateCache(player.getUniqueId(), profile);
return ActionResult.error(I18NDict.Error.MOJANG_SKIN); return ActionResult.error(I18NDict.Error.MOJANG_SKIN);
} }
} else { } else {
profile.setName(null);
dataStore.updateCache(player.getUniqueId(), profile);
return ActionResult.error(I18NDict.Error.MOJANG_NAME); return ActionResult.error(I18NDict.Error.MOJANG_NAME);
} }
return ActionResult.ok(); return ActionResult.ok();
} catch (ExecutionException e) { } catch (ExecutionException e) {
return ActionResult.error(I18NDict.Error.CACHE); return ActionResult.error(I18NDict.Error.CACHE);
} catch (IOException e) { } catch (IOException e) {
profile.setName(null);
profile.setSkin(null);
dataStore.updateCache(player.getUniqueId(), profile);
return ActionResult.error(I18NDict.Error.MOJANG_NAME); return ActionResult.error(I18NDict.Error.MOJANG_NAME);
} }
} }

2
src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java
View file

@ -1,6 +1,5 @@
package xyz.ineanto.nicko.event; package xyz.ineanto.nicko.event;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -41,7 +40,6 @@ public class PlayerJoinListener implements Listener {
optionalProfile.ifPresent(profile -> { optionalProfile.ifPresent(profile -> {
// Random Skin on connection feature // Random Skin on connection feature
if (profile.isRandomSkin()) { if (profile.isRandomSkin()) {
Bukkit.broadcast(Component.text("§c[ELITE DEBUG] §fJoined with Random Skin."));
final String name = instance.getNameFetcher().getRandomUsername(); final String name = instance.getNameFetcher().getRandomUsername();
final String skin = instance.getNameFetcher().getRandomUsername(); final String skin = instance.getNameFetcher().getRandomUsername();
profile.setName(name); profile.setName(name);