From 4053f05ba9d2dd26ca1bb3faaab3d235ff49a01d Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Mon, 6 Feb 2023 14:58:17 +0100 Subject: [PATCH] Actually check for origin on command invoke --- .../util/decree/virtual/VirtualDecreeCommand.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java index 27cd69af5..b41dfe020 100644 --- a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java +++ b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java @@ -23,10 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; -import com.volmit.iris.util.decree.DecreeContext; -import com.volmit.iris.util.decree.DecreeContextHandler; -import com.volmit.iris.util.decree.DecreeNode; -import com.volmit.iris.util.decree.DecreeParameter; +import com.volmit.iris.util.decree.*; import com.volmit.iris.util.decree.annotations.Decree; import com.volmit.iris.util.decree.exceptions.DecreeParsingException; import com.volmit.iris.util.format.C; @@ -381,6 +378,12 @@ public class VirtualDecreeCommand { return false; } + DecreeOrigin origin = type.getDeclaredAnnotation(Decree.class).origin(); + if (origin.validFor(sender)) { + sender.sendMessage(C.RED + "This command has to be sent from another origin: " + C.GOLD + origin); + return false; + } + Iris.debug("@ " + getPath() + " with " + args.toString(", ")); if (isNode()) { Iris.debug("Invoke " + getPath() + "(" + args.toString(",") + ") at ");