Merge pull request #37 from BentoBoxWorld/develop

Release 1.5.2

Author: tastybento

pom.xml

@@ -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>

src/main/java/world/bentobox/twerk/listeners/TreeGrowListener.java

@@ -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;
@@ -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;
@@ -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);
+                }
             }
         });