Skip to content

Commit 087a59f

Browse files
committed
(refactor) switch mail to new login push api
1 parent 4391078 commit 087a59f

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

src/main/java/cat/nyaa/ukit/SpigotLoader.java

-7
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,6 @@ private boolean setupEconomy() {
290290
return economyProvider != null;
291291
}
292292

293-
public void newLoginPush(UUID playerUniqueID, Component message, Component messageSender) throws SQLException, IllegalStateException {
294-
if (loginPushFunction == null) {
295-
throw new IllegalStateException("LoginPushFunction not initialized");
296-
}
297-
loginPushFunction.getLoginPushRecorder().createLoginPush(playerUniqueID, message, messageSender);
298-
}
299-
300293
private boolean setupChat() {
301294
var rsp = Bukkit.getServicesManager().getRegistration(Chat.class);
302295
if (rsp != null) {

src/main/java/cat/nyaa/ukit/mail/MailFunction.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import cat.nyaa.ukit.MainLang;
44
import cat.nyaa.ukit.SpigotLoader;
5+
import cat.nyaa.ukit.api.UKitAPI;
56
import cat.nyaa.ukit.utils.EssentialsPluginUtils;
67
import cat.nyaa.ukit.utils.LockettePluginUtils;
78
import cat.nyaa.ukit.utils.SubCommandExecutor;
@@ -213,16 +214,8 @@ public boolean invokeCommand(CommandSender commandSender, Command command, Strin
213214
Pair.of("amount", itemInHand.getAmount())
214215
);
215216

216-
if (targetPlayer.isOnline()) {
217-
targetPlayer.getPlayer().sendMessage(receiverMessage);
218-
} else {
219-
try {
220-
var serviceSenderName = getLanguage().mailLang.serviceName.produceAsComponent();
221-
pluginInstance.newLoginPush(targetPlayer.getUniqueId(), receiverMessage, serviceSenderName);
222-
} catch (SQLException | IllegalStateException ignore) {
223-
ignore.printStackTrace();
224-
}
225-
}
217+
var serviceSenderName = getLanguage().mailLang.serviceName.produceAsComponent();
218+
UKitAPI.getAPIInstance().pushMessage(targetPlayer.getUniqueId(), receiverMessage, serviceSenderName);
226219

227220
} catch (SQLException e) {
228221
e.printStackTrace();

0 commit comments

Comments
 (0)