Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 09:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert 'revert ivy change'"

Browse Source
This commit is contained in:
Jesse Boyd 2019-08-26 06:03:58 +01:00
parent edb626a961
commit aa4c443358
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/CommonConfig.kt
View File

@ -16,7 +16,7 @@ fun Project.applyCommonConfiguration() {
maven { url = uri("https://ci.athion.net/job/FAWE-Piston/ws/") }
ivy { url = uri("https://ci.athion.net/job")
patternLayout {
artifact("/[organisation]/[module]/artifact/[revision].[ext]")
artifact("/[organisation]/[revision]/artifact/[module].[ext]")
}}
}
configurations.all {

2
worldedit-core/src/main/java/com/boydti/fawe/command/CFICommand.java
View File

@ -42,7 +42,7 @@ public class CFICommand extends CommandProcessor<Object, Object> {
}
@Override
public int process(InjectedValueAccess context, List<String> args, int result) {
public Object process(InjectedValueAccess context, List<String> args, Object result) {
return result;
}

8
worldedit-core/src/main/java/com/boydti/fawe/command/CommandProcessor.java
View File

@ -67,13 +67,13 @@ public abstract class CommandProcessor<I, O> implements CommandManager {
}
@Override
public final int execute(InjectedValueAccess context, List<String> args) {
public final Object execute(InjectedValueAccess context, List<String> args) {
args = preprocess(context, args);
if (args != null) {
int result = parent.execute(context, args);
Object result = parent.execute(context, args);
return process(context, args, result); // TODO NOT IMPLEMENTED (recompile piston)
} else {
return 0;
return null;
}
}
@ -89,5 +89,5 @@ public abstract class CommandProcessor<I, O> implements CommandManager {
public abstract List<String> preprocess(InjectedValueAccess context, List<String> args);
public abstract int process(InjectedValueAccess context, List<String> args, int result);
public abstract Object process(InjectedValueAccess context, List<String> args, Object result);
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/util/DelegateCommandManager.java
View File

@ -61,7 +61,7 @@ public class DelegateCommandManager implements CommandManager {
}
@Override
public int execute(InjectedValueAccess context, List<String> args) {
public Object execute(InjectedValueAccess context, List<String> args) {
return parent.execute(context, args);
}