mirror of
https://github.com/EngineHub/WorldEdit.git
synced 2024-12-21 04:49:51 +08:00
Misc fixes.
Closes a few old youtrack issues which I don't remember because I had like 30 tabs open, and a few other issues which I found while testing some of those.
This commit is contained in:
parent
bc8e477b1c
commit
ceff17c4f7
@ -59,7 +59,7 @@ public void load() {
|
||||
|
||||
Map<String, Set<String>> userGroupPermissions = new HashMap<>();
|
||||
|
||||
List<String> groupKeys = config.getStringList("permissions.groups", null);
|
||||
List<String> groupKeys = config.getKeys("permissions.groups");
|
||||
|
||||
if (groupKeys != null) {
|
||||
for (String key : groupKeys) {
|
||||
@ -77,7 +77,7 @@ public void load() {
|
||||
}
|
||||
}
|
||||
|
||||
List<String> userKeys = config.getStringList("permissions.users", null);
|
||||
List<String> userKeys = config.getKeys("permissions.users");
|
||||
|
||||
if (userKeys != null) {
|
||||
for (String key : userKeys) {
|
||||
@ -150,7 +150,7 @@ public String[] getGroups(String player) {
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
return groups.toArray(new String[groups.size()]);
|
||||
return groups.toArray(new String[0]);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -85,9 +85,9 @@ public boolean apply(BlockVector3 position, int depth) throws WorldEditException
|
||||
if (depth == 0) {
|
||||
if (function.apply(position)) {
|
||||
affected++;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -61,7 +61,7 @@ public WorldEditExceptionConverter(WorldEdit worldEdit) {
|
||||
}
|
||||
|
||||
private CommandException newCommandException(String message, Throwable cause) {
|
||||
return new CommandException(TextComponent.of(message), cause, ImmutableList.of());
|
||||
return new CommandException(TextComponent.of(String.valueOf(message)), cause, ImmutableList.of());
|
||||
}
|
||||
|
||||
@ExceptionMatch
|
||||
|
@ -261,6 +261,7 @@ public synchronized void remove(SessionOwner owner) {
|
||||
*/
|
||||
public synchronized void unload() {
|
||||
clear();
|
||||
timer.cancel();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -46,7 +46,7 @@ public SchematicPaginationBox(String rootDir, File[] files, String pageCommand)
|
||||
|
||||
@Override
|
||||
public Component getComponent(int number) {
|
||||
checkArgument(number < files.length - 1 && number >= 0);
|
||||
checkArgument(number < files.length && number >= 0);
|
||||
File file = files[number];
|
||||
Multimap<String, ClipboardFormat> exts = ClipboardFormats.getFileExtensionMap();
|
||||
String format = exts.get(Files.getFileExtension(file.getName()))
|
||||
|
Loading…
Reference in New Issue
Block a user