mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-04-08 08:46:21 +00:00
Merge remote-tracking branch 'upstream/master' into DecreeCommands
This commit is contained in:
@@ -44,18 +44,13 @@ public class DecreeParameter {
|
||||
|
||||
public DecreeParameterHandler<?> getHandler() {
|
||||
return handlerCache.aquire(() -> {
|
||||
try
|
||||
{
|
||||
if(param.customHandler().equals(DummyHandler.class))
|
||||
{
|
||||
try {
|
||||
if (param.customHandler().equals(DummyHandler.class)) {
|
||||
return DecreeSystem.getHandler(getType());
|
||||
}
|
||||
|
||||
return param.customHandler().getConstructor().newInstance();
|
||||
}
|
||||
|
||||
catch(Throwable e)
|
||||
{
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
@@ -32,8 +32,7 @@ public interface DecreeParameterHandler<T> {
|
||||
*/
|
||||
KList<T> getPossibilities();
|
||||
|
||||
default boolean isDummy()
|
||||
{
|
||||
default boolean isDummy() {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ import com.volmit.iris.util.decree.DecreeSystem;
|
||||
import com.volmit.iris.util.decree.exceptions.DecreeParsingException;
|
||||
import com.volmit.iris.util.decree.exceptions.DecreeWhichException;
|
||||
import com.volmit.iris.util.format.Form;
|
||||
import com.volmit.iris.util.math.M;
|
||||
import com.volmit.iris.util.plugin.VolmitSender;
|
||||
import org.bukkit.FluidCollisionMode;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
@@ -29,8 +29,7 @@ public class DummyHandler implements DecreeParameterHandler<Object> {
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean isDummy()
|
||||
{
|
||||
public boolean isDummy() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user