From 310536c085fdc3d0fbc164cbc14a9b30cffc83de Mon Sep 17 00:00:00 2001
From: Govindas <16716020+GovindasOM@users.noreply.github.com>
Date: Thu, 24 Jun 2021 18:28:51 +0300
Subject: [PATCH] fix skript 2.6 support

---
 pom.xml                                                |  2 +-
 .../com/btk5h/skriptdb/skript/EffExecuteStatement.java | 10 ++++++----
 src/main/resources/plugin.yml                          |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9b32ab..2e7a5d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.btk5h</groupId>
     <artifactId>skript-db</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <packaging>jar</packaging>
 
     <repositories>
diff --git a/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java b/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java
index 596cbf3..a09f98a 100644
--- a/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java
+++ b/src/main/java/com/btk5h/skriptdb/skript/EffExecuteStatement.java
@@ -105,7 +105,6 @@ public class EffExecuteStatement extends Effect {
 
             if (getNext() != null) {
                 //if local variables are present
-                if (locals != null) {
                     //bring back local variables
 
                     //populate SQL data into variables
@@ -121,7 +120,9 @@ public class EffExecuteStatement extends Effect {
                         //SkriptDB.getPlugin(SkriptDB.class).getServer().getPluginManager().callEvent(event);
                     }
                     if (isSync || finalSync) {
-                        Variables.setLocalVariables(e, locals);
+                        if (locals != null) {
+                            Variables.setLocalVariables(e, locals);
+                        }
                         if (!(res instanceof String)) {
                             ((Map<String, Object>) res).forEach((name, value) -> setVariable(e, name, value));
                         }
@@ -129,7 +130,9 @@ public class EffExecuteStatement extends Effect {
                         Variables.removeLocals(e);
                     } else {
                         Bukkit.getScheduler().runTask(SkriptDB.getInstance(), () -> {
-                            Variables.setLocalVariables(e, locals);
+                            if (locals != null) {
+                                Variables.setLocalVariables(e, locals);
+                            }
                             if (!(res instanceof String)) {
                                 ((Map<String, Object>) res).forEach((name, value) -> setVariable(e, name, value));
                             }
@@ -140,7 +143,6 @@ public class EffExecuteStatement extends Effect {
                             Variables.removeLocals(e);
                         });
                     }
-                }
             }
         });
     }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 335c9d3..0891bfa 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: skript-db
-version: 1.3.1
+version: 1.3.2
 main: com.btk5h.skriptdb.SkriptDB
 depend: [Skript]
 authors: [btk5h, FranKusmiruk, Govindas]