Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The 1.16 PR #866

Merged
merged 2 commits into from
Jul 3, 2020
Merged

The 1.16 PR #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed2a4b5
1.16 Update
isabelcoolaf Jul 1, 2020
0a9e21d
api-version bump
isabelcoolaf Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
<dependencies>
<!--Bukkit API-->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
Copy link
Author

@isabelcoolaf isabelcoolaf Jul 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is changed due to the fact SpigotMC no longer publishes Bukkit jar files and there isn't any other Bukkit Maven repo.

Source: https://www.spigotmc.org/threads/spigot-bungeecord-1-16-1.447405/

Copy link

@RoboMWM RoboMWM Jul 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting.

With that, I'm sorta tempted to just set it to Paper at that rate then.

<version>1.16.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--Worldguard dependency-->
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,9 @@ void onPlayerInteract(PlayerInteractEvent event)
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());

Expand Down Expand Up @@ -1854,6 +1856,7 @@ else if (clickedBlock != null &&
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);
Expand All @@ -1864,6 +1867,7 @@ else if (clickedBlock != null &&
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);
Expand All @@ -1877,6 +1881,7 @@ else if (clickedBlock != null &&
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);
Expand All @@ -1885,10 +1890,11 @@ else if (clickedBlock != null &&
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())
{
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,11 +934,34 @@ static ArrayList<Material> getPlayerBlocks(Environment environment, Biome biome)
{
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
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down