From f42e418346e3547a9cb37ca379da1f330eeb5a8b Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Tue, 7 Sep 2021 17:43:13 +0200
Subject: [PATCH] Better context yes

---
 .../java/com/volmit/iris/core/commands/CommandIris.java  | 2 --
 .../iris/util/decree/virtual/VirtualDecreeCommand.java   | 2 +-
 .../java/com/volmit/iris/util/plugin/VolmitSender.java   | 9 +++------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java
index c7907cd1b..e95d8bae6 100644
--- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java
+++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java
@@ -191,8 +191,6 @@ public class CommandIris implements DecreeExecutor {
                 PlatformChunkGenerator plat = IrisToolbelt.access(player().getWorld());
                 Engine engine = plat.getEngine();
                 try {
-                    int vd = radius;
-                    int rg = 0;
                     Chunk cx = player().getLocation().getChunk();
                     KList<Runnable> js = new KList<>();
                     BurstExecutor b = MultiBurst.burst.burst();
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 141a655fe..3975ad1eb 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
@@ -449,7 +449,7 @@ public class VirtualDecreeCommand {
                 value = update;
             }
 
-            if (i.isContextual() && value == null) {
+            if (sender.isPlayer() && i.isContextual() && value == null) {
                 DecreeContextHandler<?> ch = DecreeContextHandler.contextHandlers.get(i.getType());
 
                 if (ch != null) {
diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
index 5513c3c05..8b06786ef 100644
--- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
+++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
@@ -544,17 +544,15 @@ public class VolmitSender implements CommandSender {
                         String nHoverTitle = p.getNames().convert((ff) -> "<#d665f0>" + ff).toString(", ");
                         String nDescription = "<#3fe05a>✎ <#6ad97d><font:minecraft:uniform>" + p.getDescription();
                         String nUsage;
-                        String context = "";
-                        if (p.isRequired()) {
+                        if (p.isContextual() && isPlayer()) {
+                            nUsage = "<#ff9900>➱ <#ffcc00><font:minecraft:uniform>The value may be derived from environment context" + newline;
+                        } else if (p.isRequired()) {
                             nUsage = "<#db4321>⚠ <#faa796><font:minecraft:uniform>This parameter is required.";
                         } else if (p.hasDefault()) {
                             nUsage = "<#2181db>✔ <#78dcf0><font:minecraft:uniform>Defaults to \"" + p.getParam().defaultValue() + "\" if undefined.";
                         } else {
                             nUsage = "<#a73abd>✔ <#78dcf0><font:minecraft:uniform>This parameter is optional.";
                         }
-                        if (p.isContextual()) {
-                            context = "<#ff9900>➱ <#ffcc00><font:minecraft:uniform>The value may be derived from environment context" + newline;
-                        }
                         String type = "<#cc00ff>✢ <#ff33cc><font:minecraft:uniform>This parameter is of type " + p.getType().getSimpleName();
                         String fullTitle;
                         if (p.isRequired()) {
@@ -567,7 +565,6 @@ public class VolmitSender implements CommandSender {
                                 .append("<hover:show_text:'")
                                 .append(nHoverTitle).append(newline)
                                 .append(nDescription).append(newline)
-                                .append(context)
                                 .append(nUsage).append(newline)
                                 .append(type)
                                 .append("'>")