diff --git a/UltimateStacker-API/pom.xml b/UltimateStacker-API/pom.xml
index f4e6e5b..1c2e7b2 100644
--- a/UltimateStacker-API/pom.xml
+++ b/UltimateStacker-API/pom.xml
@@ -7,7 +7,7 @@
com.craftaro
UltimateStacker-Parent
- 3.1.5
+ 3.1.6
UltimateStacker-API
1.0.0-SNAPSHOT
diff --git a/UltimateStacker-Plugin/pom.xml b/UltimateStacker-Plugin/pom.xml
index 9e7997f..9e881e4 100644
--- a/UltimateStacker-Plugin/pom.xml
+++ b/UltimateStacker-Plugin/pom.xml
@@ -7,7 +7,7 @@
com.craftaro
UltimateStacker-Parent
- 3.1.5
+ 3.1.6
UltimateStacker-Plugin
diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java
index 0db4cd6..fc36a46 100644
--- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java
+++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java
@@ -5,25 +5,23 @@ import com.craftaro.ultimatestacker.UltimateStacker;
import com.craftaro.ultimatestacker.api.stack.entity.EntityStack;
import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager;
import org.bukkit.Bukkit;
-import org.bukkit.NamespacedKey;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;
-import uk.antiperson.stackmob.api.StackedEntity;
import java.util.UUID;
public class EntityStackManagerImpl implements EntityStackManager {
private final UltimateStacker plugin;
- private final NamespacedKey STACKED_ENTITY_KEY;
+ private Object STACKED_ENTITY_KEY;
public EntityStackManagerImpl(UltimateStacker plugin) {
this.plugin = plugin;
- this.STACKED_ENTITY_KEY = new NamespacedKey(plugin, "US_AMOUNT");
+ if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_14))
+ this.STACKED_ENTITY_KEY = new org.bukkit.NamespacedKey(plugin, "US_AMOUNT");
}
@Override
@@ -39,7 +37,7 @@ public class EntityStackManagerImpl implements EntityStackManager {
return true;
}
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_14)) {
- return entity.getPersistentDataContainer().has(STACKED_ENTITY_KEY, PersistentDataType.INTEGER);
+ return entity.getPersistentDataContainer().has((org.bukkit.NamespacedKey) STACKED_ENTITY_KEY, PersistentDataType.INTEGER);
}
return false;
}
@@ -88,7 +86,7 @@ public class EntityStackManagerImpl implements EntityStackManager {
public EntityStack transferStack(LivingEntity oldEntity, LivingEntity newEntity, boolean takeOne) {
EntityStack stack = getStackedEntity(oldEntity);
if (stack == null) return null;
- EntityStack newStack = new EntityStackImpl(newEntity, takeOne ? stack.getAmount()-1 : stack.getAmount());
+ EntityStack newStack = new EntityStackImpl(newEntity, takeOne ? stack.getAmount() - 1 : stack.getAmount());
newStack.updateNameTag();
stack.destroy();
return newStack;
@@ -98,7 +96,7 @@ public class EntityStackManagerImpl implements EntityStackManager {
public EntityStack updateStack(LivingEntity oldEntity, LivingEntity newEntity) {
EntityStack stack = getStackedEntity(oldEntity);
if (stack == null) return null;
- int amount = stack.getAmount()-1;
+ int amount = stack.getAmount() - 1;
stack.destroy();
if (amount == 0 && newEntity != null) {
newEntity.remove();
diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/item/StackedItemManagerImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/item/StackedItemManagerImpl.java
index ae9365e..5cce068 100644
--- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/item/StackedItemManagerImpl.java
+++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/item/StackedItemManagerImpl.java
@@ -1,6 +1,5 @@
package com.craftaro.ultimatestacker.stackable.item;
-import com.craftaro.core.compatibility.ServerVersion;
import com.craftaro.ultimatestacker.UltimateStacker;
import com.craftaro.ultimatestacker.api.events.entity.StackedItemSpawnEvent;
import com.craftaro.ultimatestacker.api.stack.item.ItemMergeCallback;
@@ -18,7 +17,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicReference;
public class StackedItemManagerImpl implements StackedItemManager {
diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java
index f427d13..3b4a000 100644
--- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java
+++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java
@@ -159,6 +159,9 @@ public class SpawnerStackImpl implements SpawnerStack {
return null;
}
CreatureSpawner creatureSpawner = (CreatureSpawner) this.location.getBlock().getState();
+ if (creatureSpawner.getSpawnedType() == null) {
+ return null;
+ }
return Methods.compileSpawnerName(creatureSpawner.getSpawnedType(), this.amount);
}
diff --git a/pom.xml b/pom.xml
index 92b56b4..e8ba77e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.craftaro
UltimateStacker-Parent
pom
- 3.1.5
+ 3.1.6
UltimateStacker-API