From a39347b5a735e74fb7335f5fdb56419c8a5bc1bd Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Mon, 14 Jan 2019 23:45:25 -0500 Subject: [PATCH] reversed stacking --- .../com/songoda/ultimatestacker/events/BreedListeners.java | 1 + .../com/songoda/ultimatestacker/tasks/StackingTask.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/songoda/ultimatestacker/events/BreedListeners.java b/src/main/java/com/songoda/ultimatestacker/events/BreedListeners.java index 05f88a3..560fdcb 100644 --- a/src/main/java/com/songoda/ultimatestacker/events/BreedListeners.java +++ b/src/main/java/com/songoda/ultimatestacker/events/BreedListeners.java @@ -15,6 +15,7 @@ public class BreedListeners implements Listener { @EventHandler public void onBread(EntityBreedEvent event) { + event.getFather().removeMetadata("inLove", instance); event.getMother().removeMetadata("inLove", instance); } diff --git a/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java b/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java index 3e70611..0e3cf93 100644 --- a/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java +++ b/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java @@ -14,6 +14,7 @@ import org.bukkit.scheduler.BukkitRunnable; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class StackingTask extends BukkitRunnable { @@ -52,8 +53,11 @@ public class StackingTask extends BukkitRunnable { EntityStackManager stackManager = instance.getEntityStackManager(); for (World world : Bukkit.getWorlds()) { + List entities = world.getEntities(); + Collections.reverse(entities); + nextEntity: - for (Entity entityO : world.getEntities()) { + for (Entity entityO : entities) { if (entityO == null || entityO instanceof Player) continue; if (entityO instanceof Item && instance.getConfig().getBoolean("Main.Stack Items")) { @@ -141,6 +145,7 @@ public class StackingTask extends BukkitRunnable { stack.updateStack(); } + entities.clear(); } }