fix tree felling helper memory leak

GregTechCEu · Dec 30, 2024 · c21c946 · c21c946
1 parent 22391bd
commit c21c946
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/tool/TreeFellingHelper.java b/src/main/java/com/gregtechceu/gtceu/api/item/tool/TreeFellingHelper.java
@@ -29,7 +29,8 @@ public class TreeFellingHelper {
     private final Deque<BlockPos> orderedBlocks;
     private int tick;
 
-    public static Set<TreeFellingHelper> helpers = new HashSet<>();
+    public static final Set<TreeFellingHelper> helpers = new HashSet<>();
+    public static final Set<TreeFellingHelper> finished = new HashSet<>();
 
     private TreeFellingHelper(ServerPlayer player, ItemStack tool, Deque<BlockPos> orderedBlocks) {
         this.player = player;
@@ -83,12 +84,13 @@ public static void fellTree(ItemStack stack, Level level, BlockState origin, Blo
 
     @SubscribeEvent
     public static void onWorldTick(TickEvent.LevelTickEvent event) {
-        if (event.phase == TickEvent.Phase.START && event.side == LogicalSide.SERVER) {
+        if (event.phase == TickEvent.Phase.START && event.side == LogicalSide.SERVER && !helpers.isEmpty()) {
             for (var helper : helpers) {
                 if (event.level == helper.player.level()) {
                     if (helper.orderedBlocks.isEmpty() || helper.tool.isEmpty() ||
                             !(hasBehaviorsTag(helper.player.getMainHandItem()) &&
                                     getBehaviorsTag(helper.player.getMainHandItem()).getBoolean(TREE_FELLING_KEY))) {
+                        finished.add(helper);
                         continue;
                     }
                     if (helper.tick % ConfigHolder.INSTANCE.tools.treeFellingDelay == 0)
@@ -97,6 +99,9 @@ public static void onWorldTick(TickEvent.LevelTickEvent event) {
                     helper.tick++;
                 }
             }
+            if (!finished.isEmpty()) {
+                helpers.removeAll(finished);
+            }
         }
     }
 }