Merge branch 'master' into master

This commit is contained in:
Gabriele C 2020-11-16 22:15:06 +01:00 committed by GitHub
commit ac4b06386d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions

2
.gitignore vendored
View File

@ -10,3 +10,5 @@ target/classes/
target/
\.DS_Store
dependency-reduced-pom.xml

View File

@ -47,7 +47,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.3-R0.1-SNAPSHOT</version>
<version>1.16.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>

View File

@ -68,6 +68,12 @@ public enum Category {
ma.add(Material.DIAMOND_CHESTPLATE);
ma.add(Material.DIAMOND_LEGGINGS);
ma.add(Material.DIAMOND_BOOTS);
if (Version.getCurrentVersion().isNewer(Version.v1_15_R1)) {
ma.add(Material.NETHERITE_HELMET);
ma.add(Material.NETHERITE_CHESTPLATE);
ma.add(Material.NETHERITE_LEGGINGS);
ma.add(Material.NETHERITE_BOOTS);
}
return ma;
}
@ -107,6 +113,12 @@ public enum Category {
ma.add(Material.STONE_HOE);
ma.add(Material.IRON_HOE);
ma.add(Material.DIAMOND_HOE);
if (Version.getCurrentVersion().isNewer(Version.v1_15_R1)) {
ma.add(Material.NETHERITE_PICKAXE);
ma.add(Material.NETHERITE_AXE);
ma.add(Material.NETHERITE_HOE);
ma.add(Material.NETHERITE_SHOVEL);
}
return ma;
}
@ -130,6 +142,10 @@ public enum Category {
ma.add(Material.IRON_AXE);
ma.add(Material.DIAMOND_AXE);
ma.add(Material.BOW);
if (Version.getCurrentVersion().isNewer(Version.v1_15_R1)) {
ma.add(Material.NETHERITE_SWORD);
ma.add(Material.NETHERITE_AXE);
}
return ma;
}