Skip to content

Commit

Permalink
Denizen version bump and minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed Nov 29, 2020
1 parent 7af43f4 commit 6f9ccbc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
@@ -1,4 +1,4 @@
Contribution to Denizen
-----------------------

Refer to the Denizen Bukkit contribution guide: https://github.com/DenizenScript/Denizen-For-Bukkit/blob/dev/CONTRIBUTING.md
Refer to the Denizen contribution guide: https://github.com/DenizenScript/Denizen/blob/dev/CONTRIBUTING.md
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -14,7 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.16.4-R0.1-SNAPSHOT</craftbukkit.version>
<citizens.version>2.0.27-SNAPSHOT</citizens.version>
<denizen.version>1.1.8-SNAPSHOT</denizen.version>
<denizen.version>1.1.9-SNAPSHOT</denizen.version>
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
</properties>

Expand Down
Expand Up @@ -101,7 +101,7 @@ else if (!scriptEntry.hasObject("type")
throw new InvalidArgumentsException("Must specify a valid type!");
}
scriptEntry.defaultObject("state", new ElementTag("TOGGLE"))
.defaultObject("qty", new ElementTag(-1));
.defaultObject("quantity", new ElementTag(-1));
}

@Override
Expand Down
Expand Up @@ -12,8 +12,6 @@
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.world.item.ItemType;
import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.nms.NMSVersion;
import com.denizenscript.denizen.objects.CuboidTag;
import com.denizenscript.denizen.objects.ItemTag;
import com.denizenscript.denizen.objects.PlayerTag;
Expand Down Expand Up @@ -72,7 +70,7 @@ private WorldEditPlayerProperties(PlayerTag player) {
Player player;

public static Material deLegacy(Material mat) {
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13) && mat.isLegacy()) {
if (mat.isLegacy()) {
return Bukkit.getUnsafe().fromLegacy(mat);
}
return mat;
Expand Down

0 comments on commit 6f9ccbc

Please sign in to comment.