Merge branch 'development'

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
 variables:
     name: "UltimateStacker"
     path: "/builds/$CI_PROJECT_PATH"
-    version: "1.10.19"
+    version: "1.10.20"
 
 build:
   stage: build

src/main/java/com/songoda/ultimatestacker/listeners/EntityListeners.java

@@ -25,6 +25,7 @@ import org.bukkit.metadata.FixedMetadataValue;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class EntityListeners implements Listener {
 
@@ -50,11 +51,13 @@ public class EntityListeners implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onEgg(ItemSpawnEvent event) {
-        if (event.getEntity().getItemStack().getType() != Material.EGG) return;
+        Material material = event.getEntity().getItemStack().getType();
+        if (material != Material.EGG
+                && !material.name().equalsIgnoreCase("SCUTE")) return;
 
         Location location = event.getLocation();
 
-        List<Entity> entities = new ArrayList<>(location.getWorld().getNearbyEntities(location, .1, .5, .1));
+        List<Entity> entities = new ArrayList<>(location.getWorld().getNearbyEntities(location, .1, 1, .1));
 
         if (entities.isEmpty()) return;
 

src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java

@@ -96,7 +96,8 @@ public class StackingTask extends BukkitRunnable {
             return false;
 
         // Allow spawn if stackreasons are set and match, or if from a spawner
-        final String spawnReason = entity.hasMetadata("US_REASON") ? entity.getMetadata("US_REASON").get(0).asString() : null;
+        final String spawnReason = entity.hasMetadata("US_REASON") && !entity.getMetadata("US_REASON").isEmpty()
+                ? entity.getMetadata("US_REASON").get(0).asString() : null;
         List<String> stackReasons;
         if (Settings.ONLY_STACK_FROM_SPAWNERS.getBoolean()) {
             // If only stack from spawners is enabled, make sure the entity spawned from a spawner.