mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix expiring commands

Browse Source
This commit is contained in:
cyberpwn 2021-08-31 10:17:25 -04:00
parent e63c966756
commit 569c34bca0
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java
View File

@ -288,7 +288,7 @@ public class VirtualDecreeCommand {
if(i == null) if(i == null)
{ {
Iris.warn("Param " + ix + " is null? (" + in.toString(",") + ")"); continue;
} }
if (i.contains("=")) { if (i.contains("=")) {
@ -336,6 +336,12 @@ public class VirtualDecreeCommand {
KList<?> validOptions = param.getHandler().getPossibilities(value); KList<?> validOptions = param.getHandler().getPossibilities(value);
Iris.debug("Found multiple results for " + key + "=" + value + " in " + getPath() + " using the handler " + param.getHandler().getClass().getSimpleName() + " with potential matches [" + validOptions.toString(",") + "]. Asking client to define one"); Iris.debug("Found multiple results for " + key + "=" + value + " in " + getPath() + " using the handler " + param.getHandler().getClass().getSimpleName() + " with potential matches [" + validOptions.toString(",") + "]. Asking client to define one");
String update = pickValidOption(sender, validOptions, param.getHandler(), param.getName(), param.getType().getSimpleName()); String update = pickValidOption(sender, validOptions, param.getHandler(), param.getName(), param.getType().getSimpleName());
if(update == null)
{
return null;
}
Iris.debug("Client chose " + update + " for " + key + "=" + value + " (old) in " + getPath()); Iris.debug("Client chose " + update + " for " + key + "=" + value + " (old) in " + getPath());
nowhich.add(ix); nowhich.add(ix);
in.set(ix--, update); in.set(ix--, update);
@ -353,6 +359,12 @@ public class VirtualDecreeCommand {
} catch (DecreeWhichException e) { } catch (DecreeWhichException e) {
KList<?> validOptions = par.getHandler().getPossibilities(i); KList<?> validOptions = par.getHandler().getPossibilities(i);
String update = pickValidOption(sender, validOptions, par.getHandler(), par.getName(), par.getType().getSimpleName()); String update = pickValidOption(sender, validOptions, par.getHandler(), par.getName(), par.getType().getSimpleName());
if(update == null)
{
return null;
}
Iris.debug("Client chose " + update + " for " + par.getName() + "=" + i + " (old) in " + getPath()); Iris.debug("Client chose " + update + " for " + par.getName() + "=" + i + " (old) in " + getPath());
nowhich.add(ix); nowhich.add(ix);
in.set(ix--, update); in.set(ix--, update);
@ -439,6 +451,12 @@ public class VirtualDecreeCommand {
} catch (DecreeWhichException e) { } catch (DecreeWhichException e) {
KList<?> validOptions = i.getHandler().getPossibilities(i.getParam().defaultValue()); KList<?> validOptions = i.getHandler().getPossibilities(i.getParam().defaultValue());
String update = pickValidOption(sender, validOptions, i.getHandler(), i.getName(), i.getType().getSimpleName()); String update = pickValidOption(sender, validOptions, i.getHandler(), i.getName(), i.getType().getSimpleName());
if(update == null)
{
return false;
}
Iris.debug("Client chose " + update + " for " + i.getName() + "=" + i + " (old) in " + getPath()); Iris.debug("Client chose " + update + " for " + i.getName() + "=" + i + " (old) in " + getPath());
value = update; value = update;
} }