Skip to content

Commit e68afcc

Browse files
committed
Fix merge
1 parent a84633d commit e68afcc

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/WarpImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
import java.util.Collections;
99
import java.util.List;
1010

11-
@SuppressWarnings("LombokSetterMayBeUsed")
1211
public class WarpImpl implements Warp {
1312

1413
private final String name;
1514
private final Position position;
16-
private List<String> permissions;
15+
private final List<String> permissions;
1716

1817
public WarpImpl(String name, Position position, List<String> permissions) {
1918
this.name = name;

eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/repository/WarpRepositoryImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,17 @@ private void migrateWarps() {
9797
}
9898
}
9999

100-
private CompletableFuture<Void> transactionalRun(Consumer<Map<String, WarpDataConfigRepresenter>> editor) {
100+
private CompletableFuture<Void> transactionalRun(Consumer<Map<String, WarpConfigRepresenter>> editor) {
101101
return transactionalSupply(warps -> {
102102
editor.accept(warps);
103103
return null;
104104
});
105105
}
106106

107-
private <T> CompletableFuture<T> transactionalSupply(Function<Map<String, WarpDataConfigRepresenter>, T> editor) {
107+
private <T> CompletableFuture<T> transactionalSupply(Function<Map<String, WarpConfigRepresenter>, T> editor) {
108108
return scheduler.completeAsync(() -> {
109109
synchronized (READ_WRITE_LOCK) {
110-
Map<String, WarpDataConfigRepresenter> warps = new HashMap<>(this.warpDataConfig.warps);
110+
Map<String, WarpConfigRepresenter> warps = new HashMap<>(this.warpDataConfig.warps);
111111
T result = editor.apply(warps);
112112
this.warpDataConfig.warps.putAll(warps);
113113
this.configurationManager.save(this.warpDataConfig);

0 commit comments

Comments
 (0)