Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/main/java/fr/maxlego08/essentials/ZEssentialsPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand All @@ -163,6 +165,7 @@ public final class ZEssentialsPlugin extends ZPlugin implements EssentialsPlugin
private final List<Material> materials = Arrays.stream(Material.values()).filter(e -> !e.name().startsWith("LEGACY_")).toList();
private final Enchantments enchantments = new ZEnchantments();
private final List<PermissionChecker> permissionCheckers = new ArrayList<>();
private volatile Map<String, Warp> warpsByName = Collections.emptyMap();
private EssentialsUtils essentialsUtils;
private ServerStorage serverStorage = new ZServerStorage(this);
private InventoryManager inventoryManager;
Expand Down Expand Up @@ -220,6 +223,7 @@ public void onEnable() {
// Load configuration files
this.configurationFiles.forEach(ConfigurationFile::load);
ConfigStorage.getInstance().load(getPersist());
rebuildWarpCache();

// Commands
this.registerListener(this.commandManager = new ZCommandManager(this));
Expand Down Expand Up @@ -523,9 +527,23 @@ public List<Warp> getWarps() {
return ConfigStorage.warps;
}

public void rebuildWarpCache() {
Map<String, Warp> map = new HashMap<>();
for (Warp warp : ConfigStorage.warps) {
map.put(warp.name().toLowerCase(), warp);
}
this.warpsByName = Collections.unmodifiableMap(map);
}

@Override
public Optional<Warp> getWarp(String name) {
return getWarps().stream().filter(warp -> warp.name().equalsIgnoreCase(name)).findFirst();
Warp warp = this.warpsByName.get(name.toLowerCase());
if (warp != null) return Optional.of(warp);
if (this.warpsByName.size() != ConfigStorage.warps.size()) {
rebuildWarpCache();
return Optional.ofNullable(this.warpsByName.get(name.toLowerCase()));
}
return Optional.empty();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package fr.maxlego08.essentials.commands.commands.warp;

import fr.maxlego08.essentials.ZEssentialsPlugin;
import fr.maxlego08.essentials.api.EssentialsPlugin;
import fr.maxlego08.essentials.api.commands.CommandResultType;
import fr.maxlego08.essentials.api.commands.Permission;
Expand Down Expand Up @@ -35,6 +36,7 @@ protected CommandResultType perform(EssentialsPlugin plugin) {

ConfigStorage.warps.removeIf(warp -> warp.name().equalsIgnoreCase(warpName));
ConfigStorage.getInstance().save(plugin.getPersist());
((ZEssentialsPlugin) plugin).rebuildWarpCache();

message(sender, Message.COMMAND_WARP_DELETE, "%name%", warpName);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package fr.maxlego08.essentials.commands.commands.warp;

import fr.maxlego08.essentials.ZEssentialsPlugin;
import fr.maxlego08.essentials.api.EssentialsPlugin;
import fr.maxlego08.essentials.api.commands.CommandResultType;
import fr.maxlego08.essentials.api.commands.Permission;
Expand Down Expand Up @@ -40,6 +41,7 @@ protected CommandResultType perform(EssentialsPlugin plugin) {
ConfigStorage.warps.removeIf(warp -> warp.name().equalsIgnoreCase(warpName));
ConfigStorage.warps.add(new Warp(warpName, new SafeLocation(this.player.getLocation())));
ConfigStorage.getInstance().save(plugin.getPersist());
((ZEssentialsPlugin) plugin).rebuildWarpCache();

message(sender, Message.COMMAND_WARP_CREATE, "%name%", warpName);

Expand Down
Loading