From 3ca6fde19e9df910bf83737ebfa1f316f2c78f41 Mon Sep 17 00:00:00 2001
From: rockyhawk64 <rockyhawk99@gmail.com>
Date: Thu, 29 Jul 2021 20:38:31 +1000
Subject: [PATCH] 3.16.2.5

---
 resource/plugin.yml                           |  2 +-
 src/me/rockyhawk/commandpanels/Utils.java     | 31 ++++---------------
 .../placeholders/CreateText.java              |  7 +++++
 .../commandtags/tags/standard/BasicTags.java  |  2 +-
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/resource/plugin.yml b/resource/plugin.yml
index ea522e0..acabcaf 100644
--- a/resource/plugin.yml
+++ b/resource/plugin.yml
@@ -1,4 +1,4 @@
-version: 3.16.2.4
+version: 3.16.2.5
 main: me.rockyhawk.commandpanels.CommandPanels
 name: CommandPanels
 author: RockyHawk
diff --git a/src/me/rockyhawk/commandpanels/Utils.java b/src/me/rockyhawk/commandpanels/Utils.java
index 45bef32..919cd9a 100644
--- a/src/me/rockyhawk/commandpanels/Utils.java
+++ b/src/me/rockyhawk/commandpanels/Utils.java
@@ -1,14 +1,12 @@
 package me.rockyhawk.commandpanels;
 
 import me.rockyhawk.commandpanels.api.Panel;
-import me.rockyhawk.commandpanels.commandtags.PaywallOutput;
 import me.rockyhawk.commandpanels.interactives.input.PlayerInput;
 import me.rockyhawk.commandpanels.openpanelsmanager.PanelPosition;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.*;
-import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 import java.util.Objects;
@@ -132,33 +130,16 @@ public class Utils implements Listener {
                     }
                 }
                 commands = commandsAfterSequence;
-                plugin.commandTags.runCommands(panel,position,p,commands,e.getClick());
-                /*for (int i = 0; commands.size() - 1 >= i; i++) {
-                    commands.set(i,plugin.commandTags.hasCorrectClick(commands.get(i),e.getClick()));
-                    if(commands.get(i).equals("")){
-                        //click type is wrong
-                        continue;
-                    }
-                    //start custom command placeholders
+
+                for (int i = 0; commands.size() > i; i++) {
                     try {
-                        commands.set(i, commands.get(i).replaceAll("%cp-clicked%", clicked.getType().toString()));
+                        commands.set(i, commands.get(i).replaceAll("%cp-clicked%", e.getCurrentItem().getType().toString()));
                     } catch (Exception mate) {
-                        commands.set(i, commands.get(i).replaceAll("%cp-clicked%", "Air"));
+                        commands.set(i, commands.get(i).replaceAll("%cp-clicked%", "AIR"));
                     }
+                }
 
-                    //end custom command PlaceHolders
-
-                    //make the command
-                    String command = plugin.tex.placeholders(panel,position,p,commands.get(i));
-
-                    PaywallOutput val = plugin.commandTags.commandPayWall(panel,p,command);
-                    if(val == PaywallOutput.Blocked){
-                        return;
-                    }
-                    if(val == PaywallOutput.NotApplicable){
-                        plugin.commandTags.runCommand(panel,position, p, commands.get(i));
-                    }
-                }*/
+                plugin.commandTags.runCommands(panel,position,p,commands,e.getClick());
             }
         }
     }
diff --git a/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java b/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java
index 03f8413..4e37ebc 100644
--- a/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java
+++ b/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java
@@ -30,6 +30,13 @@ public class CreateText {
         }
     }
 
+    //CommandPanels send message function without the tag
+    public void sendString(Panel panel,PanelPosition position, Player p, String message){
+        if(!message.equals("")) {
+            p.sendMessage(placeholders(panel,position, p,message));
+        }
+    }
+
     //CommandPanels send message function without the tag
     public void sendString(Player p, String message){
         if(!message.equals("")) {
diff --git a/src/me/rockyhawk/commandpanels/commandtags/tags/standard/BasicTags.java b/src/me/rockyhawk/commandpanels/commandtags/tags/standard/BasicTags.java
index 73a493f..b517636 100644
--- a/src/me/rockyhawk/commandpanels/commandtags/tags/standard/BasicTags.java
+++ b/src/me/rockyhawk/commandpanels/commandtags/tags/standard/BasicTags.java
@@ -50,7 +50,7 @@ public class BasicTags implements Listener {
         }
         if(e.name.equalsIgnoreCase("msg=")) {
             e.commandTagUsed();
-            e.p.sendMessage(String.join(" ",e.args));
+            plugin.tex.sendString(e.panel,e.pos,e.p,String.join(" ",e.args));
             return;
         }
         if(e.name.equalsIgnoreCase("op=")) {