use new core commit

DenizenScript · May 8, 2019 · dd31755 · dd31755
1 parent 0ca913c
commit dd31755
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -104,7 +104,7 @@
                 <directory>${basedir}/src/main/resources</directory>
                 <includes>
                     <include>*.yml</include>
-                    <include>*.dscript</include>
+                    <include>*.dsc</include>
                 </includes>
             </resource>
         </resources>

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -1432,7 +1432,7 @@ public void buildCoreContainers(net.aufdemrand.denizencore.utilities.YamlConfigu
     public List<net.aufdemrand.denizencore.utilities.YamlConfiguration> getOutsideScripts() {
         List<net.aufdemrand.denizencore.utilities.YamlConfiguration> files = new ArrayList<net.aufdemrand.denizencore.utilities.YamlConfiguration>();
         try {
-            files.add(ScriptHelper.loadConfig("Denizen.jar/util.dscript", getResource("util.dscript")));
+            files.add(ScriptHelper.loadConfig("Denizen.jar/util.dsc", getResource("util.dsc")));
         }
         catch (IOException e) {
             dB.echoError(e);

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dBiome.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dBiome.java
@@ -271,7 +271,7 @@ else if (attribute.startsWith("water")) {
         });
     }
 
-    public static HashMap<String, TagRunnable> registeredTags = new HashMap<String, TagRunnable>();
+    public static HashMap<String, TagRunnable> registeredTags = new HashMap<>();
 
     public static void registerTag(String name, TagRunnable runnable) {
         if (runnable.name == null) {

diff --git a/plugin/src/main/resources/util.dscript → plugin/src/main/resources/util.dsc b/plugin/src/main/resources/util.dscript → plugin/src/main/resources/util.dsc