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

Release 1.5.2 #37

Merged
merged 4 commits into from
Jul 10, 2024
Merged

Release 1.5.2 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7e548c
33 prevent extra dirt (#34)
tastybento Apr 4, 2024
2c77f30
Fix particle for 1.20.6 and later #36
tastybento Jul 10, 2024
dd81a08
Version 1.5.2
tastybento Jul 10, 2024
c454328
Merge branch 'master' into develop
tastybento Jul 10, 2024
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
<java.version>1.8</java.version>
<powermock.version>2.0.4</powermock.version>
<!-- More visible way how to change dependency versions -->
<spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
<spigot.version>1.20.6-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>2.0.0-SNAPSHOT</bentobox.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- This allows to change between versions and snapshots. -->
<build.version>1.5.1</build.version>
<build.version>1.5.2</build.version>
<build.number>-LOCAL</build.number>
<sonar.organization>bentobox-world</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package world.bentobox.twerk.listeners;

import java.util.Arrays;

import java.util.Collections;
import java.util.EnumMap;
import java.util.HashMap;
Expand Down Expand Up @@ -31,7 +30,8 @@
import org.bukkit.event.world.StructureGrowEvent;
import org.eclipse.jdt.annotation.NonNull;

import world.bentobox.bentobox.BentoBox;
import com.google.common.base.Enums;

import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.lists.Flags;
import world.bentobox.bentobox.util.Util;
Expand Down Expand Up @@ -271,7 +271,13 @@ private void twerk(Player player) {
if (count >= addon.getSettings().getMinimumTwerks()) {
player.playSound(player.getLocation(), addon.getSettings().getSoundsTwerkSound(),
(float)addon.getSettings().getSoundsTwerkVolume(), (float)addon.getSettings().getSoundsTwerkPitch());
player.spawnParticle(Particle.SPELL, player.getLocation(), 20, 3D, 0D, 3D);
Particle p = Enums.getIfPresent(Particle.class, "SPELL").orNull();
if (p == null) {
p = Enums.getIfPresent(Particle.class, "POOF").orNull();
}
if (p != null) {
player.spawnParticle(p, player.getLocation(), 20, 3D, 0D, 3D);
}
}
});

Expand Down
Loading