Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2024-11-23 18:45:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Brianna O'Keefe 2019-03-07 16:00:57 -05:00
parent 791b790247
commit 1dc3ffa34c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java
View File

@ -116,17 +116,18 @@ public class StackingTask extends BukkitRunnable {
if (configurationSection.getInt("Mobs." + initalEntity.getType().name() + ".Max Stack Size") != -1) if (configurationSection.getInt("Mobs." + initalEntity.getType().name() + ".Max Stack Size") != -1)
maxEntityStackSize = configurationSection.getInt("Mobs." + initalEntity.getType().name() + ".Max Stack Size"); maxEntityStackSize = configurationSection.getInt("Mobs." + initalEntity.getType().name() + ".Max Stack Size");
List<Entity> entityList = Methods.getSimilarEntitesAroundEntity(initalEntity).stream().filter(entity -> List<Entity> entityList = Methods.getSimilarEntitesAroundEntity(initalEntity);
!entity.hasMetadata("no-stack")
&& entity.getCustomName() == null
&& stackManager.getStack(entity) != null
&& removed.contains(entity.getUniqueId())).collect(Collectors.toList());
for (Entity entity : entityList) { for (Entity entity : new ArrayList<>(entityList)) {
if (removed.contains(entity.getUniqueId())) continue;
EntityStack stack = stackManager.getStack(entity); EntityStack stack = stackManager.getStack(entity);
if (stack == null && entity.getCustomName() != null) {
entityList.remove(entity);
continue;
}
//If a stack was found add 1 to this stack. //If a stack was found add 1 to this stack.
if ((stack.getAmount() + amtToStack) <= maxEntityStackSize) { if (stack != null && (stack.getAmount() + amtToStack) <= maxEntityStackSize) {
stack.addAmount(amtToStack); stack.addAmount(amtToStack);
stack.updateStack(); stack.updateStack();
removed.add(initalEntity.getUniqueId()); removed.add(initalEntity.getUniqueId());
@ -134,6 +135,7 @@ public class StackingTask extends BukkitRunnable {
continue nextEntity; continue nextEntity;
} }
} }
if (initialStack != null) continue; if (initialStack != null) continue;

4
src/main/java/com/songoda/ultimatestacker/utils/Methods.java
View File

@ -41,7 +41,6 @@ public class Methods {
UltimateStacker instance = UltimateStacker.getInstance(); UltimateStacker instance = UltimateStacker.getInstance();
EntityStackManager stackManager = instance.getEntityStackManager(); EntityStackManager stackManager = instance.getEntityStackManager();
Entity newEntity = newEntity(killed); Entity newEntity = newEntity(killed);
killed.setMetadata("no-stack", new FixedMetadataValue(instance, true));
((LivingEntity) newEntity).getEquipment().clear(); ((LivingEntity) newEntity).getEquipment().clear();
@ -71,7 +70,8 @@ public class Methods {
if (!stackManager.isStacked(killed)) return; if (!stackManager.isStacked(killed)) return;
killed.setCustomName(null); killed.setCustomName(null);
killed.setCustomNameVisible(false); killed.setCustomNameVisible(true);
killed.setCustomName(formatText("&7"));
EntityStack stack = stackManager.getStack(killed); EntityStack stack = stackManager.getStack(killed);