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

Candles require full trust, remove duplicate candle cake handling #1827

Merged
merged 3 commits into from Mar 5, 2022
Merged

Candles require full trust, remove duplicate candle cake handling #1827

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78e3d31
Revert CANDLE_CAKES to edible cake level
Jikoo Mar 5, 2022
57243e7
Change CANDLES to full trust
Jikoo Mar 5, 2022
beaf3b4
Merge branch 'master' into fix/candle-cakes
RoboMWM Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View file
Open in desktop
Expand Up @@ -1751,9 +1751,7 @@ void onPlayerInteract(PlayerInteractEvent event)
clickedBlockType == Material.RESPAWN_ANCHOR ||
clickedBlockType == Material.ROOTED_DIRT ||
clickedBlockType == Material.STONECUTTER ||
clickedBlockType == Material.SWEET_BERRY_BUSH ||
Tag.CANDLES.isTagged(clickedBlockType) ||
Tag.CANDLE_CAKES.isTagged(clickedBlockType)
clickedBlockType == Material.SWEET_BERRY_BUSH
)))
{
if (playerData == null) playerData = this.dataStore.getPlayerData(player.getUniqueId());
Expand Down Expand Up @@ -1865,7 +1863,7 @@ else if (clickedBlock != null && instance.config_claims_preventTheft && (clicked
}
}

//apply rule for note blocks and repeaters and daylight sensors //RoboMWM: Include flower pots
//apply rule for redstone and various decor blocks that require full trust
else if (clickedBlock != null &&
(
clickedBlockType == Material.NOTE_BLOCK ||
Expand All @@ -1874,7 +1872,8 @@ else if (clickedBlock != null &&
clickedBlockType == Material.DAYLIGHT_DETECTOR ||
clickedBlockType == Material.COMPARATOR ||
clickedBlockType == Material.REDSTONE_WIRE ||
Tag.FLOWER_POTS.isTagged(clickedBlockType)
Tag.FLOWER_POTS.isTagged(clickedBlockType) ||
Tag.CANDLES.isTagged(clickedBlockType)
))
{
if (playerData == null) playerData = this.dataStore.getPlayerData(player.getUniqueId());
Expand Down