From f419f62f6c5ae7b6f71e3ed240489b2354fc1cda Mon Sep 17 00:00:00 2001
From: ineanto <pantoine.rochas@gmail.com>
Date: Sat, 1 Jul 2023 18:03:43 +0200
Subject: [PATCH] refactor: missed some more actionresults
---
logs/2023-07-01-1.log.gz | Bin 0 -> 124 bytes
.../java/xyz/atnrch/nicko/anvil/AnvilManager.java | 6 +++---
.../atnrch/nicko/event/PlayerJoinListener.java | 2 +-
.../atnrch/nicko/test/storage/BrokenSQLTest.java | 2 +-
.../atnrch/nicko/test/storage/SQLStorageTest.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 logs/2023-07-01-1.log.gz
diff --git a/logs/2023-07-01-1.log.gz b/logs/2023-07-01-1.log.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7245b8e0a8b2d01e0b5aa458a73c2859163d3c15
GIT binary patch
literal 124
zcmV-?0E7P@iwFP!00000{{_LZ4uUWc2H@SN__yL<y=yd(n`B_c#KnOy5L!(KT5~7y
z_5HqyTL~nAXH46Y%lX+q##u0^RuwQ^uBXruk)U7KWQLeZP7$xF*exlX*7|if$8GT3
edGhSg?3T+LpT+D~H44W2@$d&Fs{KK00002Nw>)bA
literal 0
HcmV?d00001
diff --git a/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java b/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java
index 66f9611..b8610da 100644
--- a/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java
+++ b/src/main/java/xyz/atnrch/nicko/anvil/AnvilManager.java
@@ -67,7 +67,7 @@ public class AnvilManager {
return Collections.singletonList(AnvilGUI.ResponseAction.replaceInputText("Invalid username!"));
} else {
appearanceManager.setName(snapshot.getText());
- final ActionResult<Void> actionResult = appearanceManager.updatePlayer(false);
+ final ActionResult actionResult = appearanceManager.updatePlayer(false, false);
return sendResultAndClose(actionResult);
}
}
@@ -87,7 +87,7 @@ public class AnvilManager {
return Collections.singletonList(AnvilGUI.ResponseAction.replaceInputText("Invalid username!"));
} else {
appearanceManager.setSkin(snapshot.getText());
- final ActionResult<Void> actionResult = appearanceManager.updatePlayer(true);
+ final ActionResult actionResult = appearanceManager.updatePlayer(true, false);
return sendResultAndClose(actionResult);
}
}
@@ -96,7 +96,7 @@ public class AnvilManager {
.text("New skin...");
}
- private List<AnvilGUI.ResponseAction> sendResultAndClose(ActionResult<Void> actionResult) {
+ private List<AnvilGUI.ResponseAction> sendResultAndClose(ActionResult actionResult) {
final I18N i18n = new I18N(player);
if (!actionResult.isError()) {
player.sendMessage(i18n.translate(I18NDict.Event.Disguise.SUCCESS));
diff --git a/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java b/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java
index c2a05a3..cf21834 100644
--- a/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java
+++ b/src/main/java/xyz/atnrch/nicko/event/PlayerJoinListener.java
@@ -25,7 +25,7 @@ public class PlayerJoinListener implements Listener {
Bukkit.getScheduler().runTaskLater(instance, () -> {
final AppearanceManager appearanceManager = AppearanceManager.get(player);
if (appearanceManager.hasData()) {
- final ActionResult actionResult = appearanceManager.updatePlayer(appearanceManager.needsASkinChange(), true);
+ final ActionResult actionResult = appearanceManager.updatePlayer(appearanceManager.needsASkinChange(), false);
if (!actionResult.isError()) {
player.sendMessage(i18n.translate(I18NDict.Event.PreviousSkin.SUCCESS));
} else {
diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
index 4f204f4..ac19e25 100644
--- a/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
+++ b/src/test/java/xyz/atnrch/nicko/test/storage/BrokenSQLTest.java
@@ -43,7 +43,7 @@ public class BrokenSQLTest {
public void storePlayer() {
final Optional<NickoProfile> optionalProfile = plugin.getDataStore().getData(player.getUniqueId());
assertFalse(optionalProfile.isPresent());
- ActionResult<Void> result = plugin.getDataStore().saveData(player);
+ ActionResult result = plugin.getDataStore().saveData(player);
assertTrue(result.isError());
}
diff --git a/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
index c6c9380..ba05003 100644
--- a/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
+++ b/src/test/java/xyz/atnrch/nicko/test/storage/SQLStorageTest.java
@@ -75,7 +75,7 @@ public class SQLStorageTest {
profile.setLocale(Locale.FRENCH);
profile.setBungeecordTransfer(false);
- final ActionResult<Void> result = plugin.getDataStore().saveData(player);
+ final ActionResult result = plugin.getDataStore().saveData(player);
assertFalse(result.isError());
final Optional<NickoProfile> optionalUpdatedProfile = plugin.getDataStore().getData(player.getUniqueId());
@@ -99,7 +99,7 @@ public class SQLStorageTest {
profile.setName(null);
profile.setSkin(null);
- final ActionResult<Void> result = plugin.getDataStore().saveData(player);
+ final ActionResult result = plugin.getDataStore().saveData(player);
assertFalse(result.isError());
final Optional<NickoProfile> optionalUpdatedProfile = plugin.getDataStore().getData(player.getUniqueId());