set new canRunScripts to false on types where that applies

DenizenScript · Apr 14, 2020 · 12c234e · 12c234e
1 parent 202a8d8
commit 12c234e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java
@@ -381,8 +381,7 @@ else if (lastLocation != null && lastVelocity != null) {
 
                         // Build a queue out of the targeted script
                         List<ScriptEntry> entries = script.getContainer().getBaseEntries(scriptEntry.entryData.clone());
-                        ScriptQueue queue = new InstantQueue(script.getContainer().getName())
-                                .addEntries(entries);
+                        ScriptQueue queue = new InstantQueue(script.getContainer().getName()).addEntries(entries);
 
                         // Add relevant definitions
                         queue.addDefinition("location", lastLocation);

diff --git a/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/BookScriptContainer.java b/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/BookScriptContainer.java
@@ -53,6 +53,7 @@ public class BookScriptContainer extends ScriptContainer {
     // -->
     public BookScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) {
         super(configurationSection, scriptContainerName);
+        canRunScripts = false;
     }
 
     public ItemTag getBookFrom(TagContext context) {

diff --git a/...rc/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptContainer.java b/...rc/main/java/com/denizenscript/denizen/scripts/containers/core/EntityScriptContainer.java
@@ -60,6 +60,7 @@ public class EntityScriptContainer extends ScriptContainer {
 
     public EntityScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) {
         super(configurationSection, scriptContainerName);
+        canRunScripts = false;
     }
 
     public EntityTag getEntityFrom() {

diff --git a/...rc/main/java/com/denizenscript/denizen/scripts/containers/core/FormatScriptContainer.java b/...rc/main/java/com/denizenscript/denizen/scripts/containers/core/FormatScriptContainer.java
@@ -34,6 +34,7 @@ public class FormatScriptContainer extends ScriptContainer {
 
     public FormatScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) {
         super(configurationSection, scriptContainerName);
+        canRunScripts = false;
     }
 
     public String getFormat() {

diff --git a/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptContainer.java b/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptContainer.java
@@ -149,6 +149,7 @@ public class ItemScriptContainer extends ScriptContainer {
 
     public ItemScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) {
         super(configurationSection, scriptContainerName);
+        canRunScripts = false;
 
         ItemScriptHelper.item_scripts.put(getName(), this);
         ItemScriptHelper.item_scripts_by_hash_id.put(ItemScriptHelper.createItemScriptID(this), this);

diff --git a/...n/src/main/java/com/denizenscript/denizen/scripts/containers/core/MapScriptContainer.java b/...n/src/main/java/com/denizenscript/denizen/scripts/containers/core/MapScriptContainer.java
@@ -17,6 +17,7 @@ public class MapScriptContainer extends ScriptContainer {
 
     public MapScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) {
         super(configurationSection, scriptContainerName);
+        canRunScripts = false;
     }
 
     // <--[language]

diff --git a/...c/main/java/com/denizenscript/denizen/scripts/containers/core/VersionScriptContainer.java b/...c/main/java/com/denizenscript/denizen/scripts/containers/core/VersionScriptContainer.java
@@ -8,6 +8,7 @@ public class VersionScriptContainer extends ScriptContainer {
 
     public VersionScriptContainer(YamlConfiguration configurationSection, String scriptContainerName) {
         super(configurationSection, scriptContainerName);
+        canRunScripts = false;
         Deprecations.versionScripts.warn(this);
     }
 }