Merge remote-tracking branch 'origin/master'

2024-11-26 12:35:15 +01:00 · 2016-06-24 10:59:18 -04:00 · 2016-06-24 10:59:18 -04:00 · 3a973342ae
commit 3a973342ae
parent 6e25aab51f a49492aae3
2 changed files with 4 additions and 1 deletions
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
@ -84,6 +84,9 @@ public class DebugExec extends SubCommand {
    }

    public ScriptEngine getEngine() {
+        if (this.engine == null) {
+            init();
+        }
        return this.engine;
    }

--- a/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
@ -447,10 +447,10 @@ public abstract class HybridUtils {
                        }
                    }
                }
+                queue.enqueue();
                return true;
            }
        }
-        queue.enqueue();
        return false;
    }
 }