scrow/scrow-monorepo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

.

Browse source
This commit is contained in:
kento2 2026-06-01 12:44:30 +02:00
parent cc402a71e7
commit f9ceea47d6
7 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendListLiteral.java
View file

@ -32,8 +32,6 @@ public class FriendListLiteral {
})
.doOnNext(line -> ctx.getSender().sendMessage(line))
.doOnComplete(() -> ctx.getSender().sendMessage("EOF"))
.subscribeOn(Schedulers.boundedElastic())
.subscribe();
}

5
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRemoveLiteral.java
View file

@ -27,10 +27,9 @@ public class FriendRemoveLiteral {
var friend = ctx.getArg(playerArg);
ScrowAPI.getFriendshipService().deleteFriendship(friend.getUniqueId(), ctx.getPlayerSender().getUniqueId())
.doOnNext(wasDeleted -> {
.subscribe(wasDeleted -> {
if (wasDeleted) throw new CommandException("You were not friends with " + friend.getName() + " in the first place");
ctx.getSender().sendMessage("You are no longer friends with " + friend.getName());
})
.subscribe();
});
}
}

4
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/command/FriendRequestsLiteral.java
View file

@ -3,11 +3,9 @@ package de.kentoj.scrow.bukkit.friends.command;
import de.kentoj.kencommandapi.BukkitCommandContext;
import de.kentoj.kencommandapi.api.structure.node.CommandNode;
import de.kentoj.scrow.bukkit.ScrowAPI;
import de.kentoj.scrow.bukkit.friends.FriendRequestService;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import reactor.core.scheduler.Schedulers;
public class FriendRequestsLiteral {
@ -29,8 +27,6 @@ public class FriendRequestsLiteral {
return "- " + fromName;
}).doOnNext(line -> ctx.getPlayerSender().sendMessage(line))
.doOnComplete(() -> ctx.getPlayerSender().sendMessage("EOF"))
.subscribeOn(Schedulers.boundedElastic())
.subscribe();
}
}

17
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/handler/FriendAddHandler.java
View file

@ -9,7 +9,6 @@ import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import java.time.Instant;
@ -26,7 +25,6 @@ public class FriendAddHandler {
ScrowAPI.getCommandManager().sendErrorMessage(self, e);
})
.onErrorComplete(CommandException.class)
.subscribeOn(Schedulers.boundedElastic())
.subscribe();
}
@ -43,13 +41,22 @@ public class FriendAddHandler {
private Mono<?> sendRequest() {
return ScrowAPI.getFriendRequestService().saveFriendRequest(new FriendRequestImpl(self.getUniqueId(), other.getUniqueId(), Instant.now()))
.then(sendMessage(self.getPlayer(), "Successfully sent " + other.getName() + " a friend request."))
.then(Mono.fromRunnable(() -> {
.flatMap(success -> {
if (success) {
sendMessage(self.getPlayer(), "Successfully sent " + other.getName() + " a friend request.");
return Mono.just(true);
} else {
sendMessage(self.getPlayer(), "You already sent " + other.getName() + " a friend request");
return Mono.just(Mono.empty());
}
})
.doOnNext(success -> {
var otherPlayer = other.getPlayer();
if (otherPlayer != null)
sendMessage(otherPlayer, self.getName() + " wants to be friends with you. Use '/f add " + self.getName() + "' to accept.").subscribe();
}))
})
.doOnError(this::handleError);
}
private Mono<?> acceptRequest() {