diff --git a/pom.xml b/pom.xml index 5538f77..da01185 100644 --- a/pom.xml +++ b/pom.xml @@ -71,9 +71,9 @@ - org.bukkit - bukkit - 1.15.2-R0.1-SNAPSHOT + org.spigotmc + spigot-api + 1.16.1-R0.1-SNAPSHOT provided diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index c67e11e..4c08a57 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -1656,7 +1656,9 @@ class PlayerEventHandler implements Listener clickedBlockType == Material.STONECUTTER || clickedBlockType == Material.GRINDSTONE || clickedBlockType == Material.CARTOGRAPHY_TABLE || - clickedBlockType == Material.LOOM))) + clickedBlockType == Material.LOOM || + clickedBlockType == Material.RESPAWN_ANCHOR + ))) { if (playerData == null) playerData = this.dataStore.getPlayerData(player.getUniqueId()); @@ -1854,6 +1856,7 @@ class PlayerEventHandler implements Listener spawn_eggs.add(Material.EVOKER_SPAWN_EGG); spawn_eggs.add(Material.GHAST_SPAWN_EGG); spawn_eggs.add(Material.GUARDIAN_SPAWN_EGG); + spawn_eggs.add(Material.HOGLIN_SPAWN_EGG); spawn_eggs.add(Material.HORSE_SPAWN_EGG); spawn_eggs.add(Material.HUSK_SPAWN_EGG); spawn_eggs.add(Material.LLAMA_SPAWN_EGG); @@ -1864,6 +1867,7 @@ class PlayerEventHandler implements Listener spawn_eggs.add(Material.PARROT_SPAWN_EGG); spawn_eggs.add(Material.PHANTOM_SPAWN_EGG); spawn_eggs.add(Material.PIG_SPAWN_EGG); + spawn_eggs.add(Material.PIGLIN_SPAWN_EGG); spawn_eggs.add(Material.POLAR_BEAR_SPAWN_EGG); spawn_eggs.add(Material.PUFFERFISH_SPAWN_EGG); spawn_eggs.add(Material.RABBIT_SPAWN_EGG); @@ -1877,6 +1881,7 @@ class PlayerEventHandler implements Listener spawn_eggs.add(Material.SPIDER_SPAWN_EGG); spawn_eggs.add(Material.SQUID_SPAWN_EGG); spawn_eggs.add(Material.STRAY_SPAWN_EGG); + spawn_eggs.add(Material.STRIDER_SPAWN_EGG); spawn_eggs.add(Material.TROPICAL_FISH_SPAWN_EGG); spawn_eggs.add(Material.TURTLE_SPAWN_EGG); spawn_eggs.add(Material.VEX_SPAWN_EGG); @@ -1885,10 +1890,11 @@ class PlayerEventHandler implements Listener spawn_eggs.add(Material.WITCH_SPAWN_EGG); spawn_eggs.add(Material.WITHER_SKELETON_SPAWN_EGG); spawn_eggs.add(Material.WOLF_SPAWN_EGG); + spawn_eggs.add(Material.ZOGLIN_SPAWN_EGG); spawn_eggs.add(Material.ZOMBIE_SPAWN_EGG); spawn_eggs.add(Material.ZOMBIE_HORSE_SPAWN_EGG); - spawn_eggs.add(Material.ZOMBIE_PIGMAN_SPAWN_EGG); spawn_eggs.add(Material.ZOMBIE_VILLAGER_SPAWN_EGG); + spawn_eggs.add(Material.ZOMBIFIED_PIGLIN_SPAWN_EGG); for (Material material : Material.values()) { diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java b/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java index 49db169..15e86b2 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java @@ -934,11 +934,34 @@ class RestoreNatureProcessingTask implements Runnable { playerBlocks.add(Material.NETHERRACK); playerBlocks.add(Material.SOUL_SAND); + playerBlocks.add(Material.SOUL_SOIL); playerBlocks.add(Material.GLOWSTONE); playerBlocks.add(Material.NETHER_BRICK); playerBlocks.add(Material.NETHER_BRICK_FENCE); playerBlocks.add(Material.NETHER_BRICK_STAIRS); playerBlocks.add(Material.MAGMA_BLOCK); + playerBlocks.add(Material.ANCIENT_DEBRIS); + playerBlocks.add(Material.BASALT); + playerBlocks.add(Material.BLACKSTONE); + playerBlocks.add(Material.GILDED_BLACKSTONE); + playerBlocks.add(Material.CHAIN); + playerBlocks.add(Material.SHROOMLIGHT); + playerBlocks.add(Material.NETHER_GOLD_ORE); + playerBlocks.add(Material.NETHER_SPROUTS); + playerBlocks.add(Material.CRIMSON_FUNGUS); + playerBlocks.add(Material.CRIMSON_NYLIUM); + playerBlocks.add(Material.CRIMSON_ROOTS); + playerBlocks.add(Material.CRIMSON_STEM); + playerBlocks.add(Material.NETHER_WART_BLOCK); + playerBlocks.add(Material.WEEPING_VINES); + playerBlocks.add(Material.WEEPING_VINES_PLANT); + playerBlocks.add(Material.WARPED_FUNGUS); + playerBlocks.add(Material.WARPED_NYLIUM); + playerBlocks.add(Material.WARPED_ROOTS); + playerBlocks.add(Material.WARPED_STEM); + playerBlocks.add(Material.WARPED_WART_BLOCK); + playerBlocks.add(Material.TWISTING_VINES); + playerBlocks.add(Material.TWISTING_VINES_PLANT); } //these are unnatural in the standard and nether worlds, but not in the end diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6eb5870..bd5ab44 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ softdepend: [Vault, Multiverse-Core, My_Worlds, MystCraft, Transporter, TheUnder dev-url: https://dev.bukkit.org/projects/grief-prevention loadbefore: [TheUnderground] version: '${project.version}-${git.commit.id.abbrev}' -api-version: '1.15' +api-version: '1.16' commands: abandonclaim: description: Deletes a claim.