Remove LinkedList usage

https://twitter.com/joshbloch/status/583813919019573248

src/main/java/emu/grasscutter/game/player/PlayerBuffManager.java

@@ -1,6 +1,6 @@
 package emu.grasscutter.game.player;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -15,11 +15,8 @@ import emu.grasscutter.server.packet.send.PacketServerBuffChangeNotify;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.val;
 
-@Getter(AccessLevel.PRIVATE)
 public class PlayerBuffManager extends BasePlayerManager {
     private int nextBuffUid;
 
@@ -29,7 +26,7 @@ public class PlayerBuffManager extends BasePlayerManager {
     public PlayerBuffManager(Player player) {
         super(player);
         this.buffs = new Int2ObjectOpenHashMap<>();
-        this.pendingBuffs = new LinkedList<>();
+        this.pendingBuffs = new ArrayList<>();
     }
 
     /**
@@ -46,7 +43,7 @@ public class PlayerBuffManager extends BasePlayerManager {
      * @return True if a buff with this group id exists
      */
     public synchronized boolean hasBuff(int groupId) {
-        return this.getBuffs().containsKey(groupId);
+        return this.buffs.containsKey(groupId);
     }
 
     /**
@@ -55,11 +52,11 @@ public class PlayerBuffManager extends BasePlayerManager {
     public synchronized void clearBuffs() {
         // Remove from player
         getPlayer().sendPacket(
-            new PacketServerBuffChangeNotify(getPlayer(), ServerBuffChangeType.SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF, getBuffs().values())
+            new PacketServerBuffChangeNotify(getPlayer(), ServerBuffChangeType.SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF, this.buffs.values())
         );
 
         // Clear
-        getBuffs().clear();
+        this.buffs.clear();
     }
 
     /**
@@ -139,7 +136,7 @@ public class PlayerBuffManager extends BasePlayerManager {
 
         // Create and store buff
         PlayerBuff buff = new PlayerBuff(getNextBuffUid(), buffData, duration);
-        getBuffs().put(buff.getGroupId(), buff);
+        this.buffs.put(buff.getGroupId(), buff);
 
         // Packet
         getPlayer().sendPacket(new PacketServerBuffChangeNotify(getPlayer(), ServerBuffChangeType.SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF, buff));
@@ -153,7 +150,7 @@ public class PlayerBuffManager extends BasePlayerManager {
      * @return True if a buff was remove
      */
     public synchronized boolean removeBuff(int buffGroupId) {
-        PlayerBuff buff = this.getBuffs().get(buffGroupId);
+        PlayerBuff buff = this.buffs.get(buffGroupId);
 
         if (buff != null) {
             getPlayer().sendPacket(
@@ -167,28 +164,24 @@ public class PlayerBuffManager extends BasePlayerManager {
 
     public synchronized void onTick() {
         // Skip if no buffs
-        if (getBuffs().size() == 0) return;
+        if (this.buffs.isEmpty()) return;
 
         long currentTime = System.currentTimeMillis();
 
         // Add to pending buffs to remove if buff has expired
-        for (PlayerBuff buff : getBuffs().values()) {
-            if (currentTime > buff.getEndTime()) {
-                this.getPendingBuffs().add(buff);
-            }
-        }
+        this.buffs.values().removeIf(buff -> {
+            if (currentTime <= buff.getEndTime())
+                return false;
+            this.pendingBuffs.add(buff);
+            return true;
+        });
 
-        if (this.getPendingBuffs().size() > 0) {
+        if (this.pendingBuffs.size() > 0) {
             // Send packet
             getPlayer().sendPacket(
                 new PacketServerBuffChangeNotify(getPlayer(), ServerBuffChangeType.SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF, this.pendingBuffs)
             );
-
-            // Remove buff from player buff map
-            for (PlayerBuff buff : this.getPendingBuffs()) {
-                getBuffs().remove(buff.getGroupId());
-            }
-            this.getPendingBuffs().clear();
+            this.pendingBuffs.clear();
         }
     }
 

src/main/java/emu/grasscutter/game/world/Scene.java

@@ -274,15 +274,8 @@ public class Scene {
     }
 
     public void showOtherEntities(Player player) {
-        List<GameEntity> entities = new LinkedList<>();
         GameEntity currentEntity = player.getTeamManager().getCurrentAvatarEntity();
-
-        for (GameEntity entity : this.getEntities().values()) {
-            if (entity == currentEntity) {
-                continue;
-            }
-            entities.add(entity);
-        }
+        List<GameEntity> entities = this.getEntities().values().stream().filter(entity -> entity != currentEntity).toList();
 
         player.sendPacket(new PacketSceneEntityAppearNotify(entities, VisionType.VISION_TYPE_MEET));
     }
@@ -422,8 +415,8 @@ public class Scene {
         }
 
         // Todo
-        List<GameEntity> toAdd = new LinkedList<>();
-        List<GameEntity> toRemove = new LinkedList<>();
+        List<GameEntity> toAdd = new ArrayList<>();
+        List<GameEntity> toRemove = new ArrayList<>();
         var spawnedEntities = this.getSpawnedEntities();
         for (SpawnDataEntry entry : visible) {
             // If spawn entry is in our view and hasnt been spawned/killed yet, we should spawn it