Fix minions showing across profiles

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/java/me/Danker/features/MinionLastCollected.java b/src/main/java/me/Danker/features/MinionLastCollected.java
index 7079f40..d793970 100644
--- a/src/main/java/me/Danker/features/MinionLastCollected.java
+++ b/src/main/java/me/Danker/features/MinionLastCollected.java
@@ -13,6 +13,7 @@ import net.minecraft.entity.item.EntityArmorStand;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.play.client.C02PacketUseEntity;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -72,6 +73,7 @@ public class MinionLastCollected {
     public void onWorldRender(RenderWorldLastEvent event) {
         if (ToggleCommand.minionLastCollected && Utils.inSkyblock && Utils.tabLocation.equals("Private Island")) {
             for (Minion minion : minions) {
+                if (!minionExistsAtPos(minion.pos)) continue;
                 RenderUtils.draw3DString(minion.pos.getX() + 0.5, minion.pos.getY() + 2.2, minion.pos.getZ() + 0.5, minion.getTimeCollected(), LAST_COLLECTED_COLOUR, event.partialTicks);
             }
         }
@@ -98,6 +100,12 @@ public class MinionLastCollected {
         return null;
     }
 
+    public boolean minionExistsAtPos(BlockPos pos) {
+        AxisAlignedBB aabb = new AxisAlignedBB(pos, pos.add(1, 1, 1));
+        List<EntityArmorStand> entities = Minecraft.getMinecraft().theWorld.getEntitiesWithinAABB(EntityArmorStand.class, aabb);
+        return entities.size() > 0; // just assume theres a minion there
+    }
+
     public static void save() {
         try (FileWriter writer = new FileWriter(configFile)) {
             new GsonBuilder().create().toJson(minions, writer);