Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-02 15:10:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes.

Browse Source 
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:
wizjany 2019-05-05 14:25:43 -04:00
parent bc8e477b1c
commit ceff17c4f7
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-bukkit/src/main/java/com/sk89q/wepif/ConfigurationPermissionsResolver.java
View File

@ -59,7 +59,7 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
Map<String, Set<String>> userGroupPermissions = new HashMap<>(); 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) { if (groupKeys != null) {
for (String key : groupKeys) { for (String key : groupKeys) {
@ -77,7 +77,7 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
} }
} }
List<String> userKeys = config.getStringList("permissions.users", null); List<String> userKeys = config.getKeys("permissions.users");
if (userKeys != null) { if (userKeys != null) {
for (String key : userKeys) { for (String key : userKeys) {
@ -150,7 +150,7 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
return new String[0]; return new String[0];
} }
return groups.toArray(new String[groups.size()]); return groups.toArray(new String[0]);
} }
@Override @Override

2
worldedit-core/src/main/java/com/sk89q/worldedit/function/GroundFunction.java
View File

@ -85,9 +85,9 @@ public class GroundFunction implements LayerFunction {
if (depth == 0) { if (depth == 0) {
if (function.apply(position)) { if (function.apply(position)) {
affected++; affected++;
return true;
} }
} }
return false; return false;
} }

2
worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/exception/WorldEditExceptionConverter.java
View File

@ -61,7 +61,7 @@ public class WorldEditExceptionConverter extends ExceptionConverterHelper {
} }
private CommandException newCommandException(String message, Throwable cause) { 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 @ExceptionMatch

1
worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java
View File

@ -261,6 +261,7 @@ public class SessionManager {
*/ */
public synchronized void unload() { public synchronized void unload() {
clear(); clear();
timer.cancel();
} }
/** /**

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/SchematicPaginationBox.java
View File

@ -46,7 +46,7 @@ public class SchematicPaginationBox extends PaginationBox {
@Override @Override
public Component getComponent(int number) { public Component getComponent(int number) {
checkArgument(number < files.length - 1 && number >= 0); checkArgument(number < files.length && number >= 0);
File file = files[number]; File file = files[number];
Multimap<String, ClipboardFormat> exts = ClipboardFormats.getFileExtensionMap(); Multimap<String, ClipboardFormat> exts = ClipboardFormats.getFileExtensionMap();
String format = exts.get(Files.getFileExtension(file.getName())) String format = exts.get(Files.getFileExtension(file.getName()))