13
0

Fix Schem Delete Member #116

Zusammengeführt
Chaoscaot hat 2 Commits von fixes nach master 2022-03-26 11:54:56 +01:00 zusammengeführt
2 geänderte Dateien mit 6 neuen und 8 gelöschten Zeilen
Nur Änderungen aus Commit ef87eae96e werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -37,6 +37,8 @@ import org.bukkit.Material;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.sql.Timestamp;
import java.time.Instant;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -272,6 +274,9 @@ public class SchematicCommand extends SWCommand {
if (!nodes.isEmpty()) { if (!nodes.isEmpty()) {
for (SchematicNode schematicNode : nodes) { for (SchematicNode schematicNode : nodes) {
SchematicNode newNode = mkdirs(schematicNode.generateBreadcrumbs(user).split("/"), target, 1); SchematicNode newNode = mkdirs(schematicNode.generateBreadcrumbs(user).split("/"), target, 1);
if(SchematicNode.getSchematicNode(schematicNode.getName(), newNode == null ? 0 : newNode.getId()) != null) {
schematicNode.setName(schematicNode.getName() + "-" + Instant.now().getEpochSecond() % 1000);
}
schematicNode.setParent(newNode == null ? 0 : newNode.getId()); schematicNode.setParent(newNode == null ? 0 : newNode.getId());
} }
} }

Datei anzeigen

@ -202,14 +202,7 @@ public class SchematicCommandUtils {
} }
player.sendMessage("§7Format: §e" + (node.getSchemFormat() ? ".schem" : ".schematic")); player.sendMessage("§7Format: §e" + (node.getSchemFormat() ? ".schem" : ".schematic"));
List<CheckedSchematic> checkedSchematics = CheckedSchematic.getLastDeclined(player.getUniqueId()); CheckedSchematic.getLastDeclinedOfNode(node).stream().findFirst().ifPresent(checkedSchematic -> player.sendMessage("§cStatus: §c" + checkedSchematic.getStartTime() + " : " + checkedSchematic.getDeclineReason()));
for (CheckedSchematic checkedSchematic : checkedSchematics) {
if (checkedSchematic.getSchemName().equals(node.getName()) &&
checkedSchematic.getSchemOwner() == node.getOwner()) {
player.sendMessage("§cStatus: §c" + checkedSchematic.getStartTime() + " : " + checkedSchematic.getDeclineReason());
break;
}
}
} }
List<String> schematicMembers = new ArrayList<>(); List<String> schematicMembers = new ArrayList<>();
NodeMember.getNodeMembers(node.getId()).forEach(nodeMember -> schematicMembers.add(SteamwarUser.get(nodeMember.getMember()).getUserName())); NodeMember.getNodeMembers(node.getId()).forEach(nodeMember -> schematicMembers.add(SteamwarUser.get(nodeMember.getMember()).getUserName()));