diff --git a/Management-Server/src/main/java/ms/net/IoSession.java b/Management-Server/src/main/java/ms/net/IoSession.java index 21a836534..3ea1a3be3 100644 --- a/Management-Server/src/main/java/ms/net/IoSession.java +++ b/Management-Server/src/main/java/ms/net/IoSession.java @@ -45,7 +45,7 @@ public class IoSession { /** * The currently queued writing data. */ - private List writingQueue = new ArrayList<>(); + private List writingQueue = new ArrayList<>(20); /** * The currently queued reading data. diff --git a/Management-Server/src/main/java/ms/system/communication/CommunicationInfo.java b/Management-Server/src/main/java/ms/system/communication/CommunicationInfo.java index 8f4ec2ce8..4f9c2f3be 100644 --- a/Management-Server/src/main/java/ms/system/communication/CommunicationInfo.java +++ b/Management-Server/src/main/java/ms/system/communication/CommunicationInfo.java @@ -38,7 +38,7 @@ public final class CommunicationInfo { /** * The list of blocked players. */ - private final List blocked = new ArrayList<>(); + private final List blocked = new ArrayList<>(20); /** * The player's clan name. @@ -105,7 +105,7 @@ public final class CommunicationInfo { if (privateChatSetting != 2) { for (GameServer server : WorldDatabase.getWorlds()) { if (server != null && server.isActive()) { - List names = new ArrayList<>(); + List names = new ArrayList<>(20); for (PlayerSession p : server.getPlayers().values()) { if (p.isActive() && p.getCommunication().contacts.containsKey(player.getUsername())) { if (privateChatSetting == 0 || contacts.containsKey(p.getUsername())) { diff --git a/Management-Server/src/main/java/ms/system/mysql/SQLTable.java b/Management-Server/src/main/java/ms/system/mysql/SQLTable.java index ad707e2f7..f30499f2b 100644 --- a/Management-Server/src/main/java/ms/system/mysql/SQLTable.java +++ b/Management-Server/src/main/java/ms/system/mysql/SQLTable.java @@ -42,7 +42,7 @@ public final class SQLTable { * @return The columns. */ public List getChanged() { - List updated = new ArrayList<>(); + List updated = new ArrayList<>(20); for (int i = 0; i < columns.length; i++) { SQLColumn column = columns[i]; if (column.isChanged()) { diff --git a/Server/data/botdata/namesandarmorscript b/Server/data/botdata/namesandarmorscript index 25b000097..b22283d14 100644 --- a/Server/data/botdata/namesandarmorscript +++ b/Server/data/botdata/namesandarmorscript @@ -19,7 +19,7 @@ import java.util.ArrayList; @ScriptManifest(name = "Fetch data10", author = "b4", version = 2, logo = "", info = "info") public class Reader extends Script { - private ArrayList names = new ArrayList<>(); + private ArrayList names = new ArrayList<>(20); @Override public int onLoop() { diff --git a/Server/src/main/java/core/game/container/Container.java b/Server/src/main/java/core/game/container/Container.java index c8cfd7a6b..67097d038 100644 --- a/Server/src/main/java/core/game/container/Container.java +++ b/Server/src/main/java/core/game/container/Container.java @@ -46,7 +46,7 @@ public class Container { /** * The container listeners. */ - private final List listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(20); /** * Constructs a new {@code Container} {@code Object}. diff --git a/Server/src/main/java/core/game/content/activity/barrows/BarrowsPuzzle.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowsPuzzle.java index 112422ecb..0c158e6ee 100644 --- a/Server/src/main/java/core/game/content/activity/barrows/BarrowsPuzzle.java +++ b/Server/src/main/java/core/game/content/activity/barrows/BarrowsPuzzle.java @@ -74,7 +74,7 @@ public final class BarrowsPuzzle extends ComponentPlugin { */ public BarrowsPuzzle create() { int[] answers = Arrays.copyOf(answerModels, answerModels.length); - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (int answer : answers) { list.add(answer); } diff --git a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java index 7a48b1c66..5bce8f92c 100644 --- a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java +++ b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java @@ -78,7 +78,7 @@ public final class BountyHunterActivity extends ActivityPlugin { /** * The waiting room. */ - private final List waitingRoom = new ArrayList<>(); + private final List waitingRoom = new ArrayList<>(20); /** * The crater type. diff --git a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java index 050be2f06..bdad6555a 100644 --- a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java @@ -54,17 +54,17 @@ public final class ClanWarsActivityPlugin extends ActivityPlugin { /** * The first clan's players. */ - private List firstClanPlayers = new ArrayList<>(); + private List firstClanPlayers = new ArrayList<>(20); /** * The second clan's players. */ - private List secondClanPlayers = new ArrayList<>(); + private List secondClanPlayers = new ArrayList<>(20); /** * The list of viewing players. */ - private List viewingPlayers = new ArrayList<>(); + private List viewingPlayers = new ArrayList<>(20); /** * The amount of ticks. diff --git a/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java b/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java index e268d0207..34fc12bb1 100644 --- a/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java +++ b/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java @@ -216,7 +216,7 @@ public final class DuelArenaActivity extends ActivityPlugin { * @return {@code DuelArea} the area. */ public static DuelArea getDuelArea(boolean obstacles) { - List options = new ArrayList<>(); + List options = new ArrayList<>(20); for (DuelArea area : DUEL_AREAS) { if (!obstacles && area.isObstacles() || obstacles && !area.isObstacles()) { continue; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java index 20d7c6525..ba97fef05 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java @@ -65,7 +65,7 @@ public final class GWDGraardorSwingHandler extends CombatSwingHandler { } else { ticks += (int) Math.ceil(entity.getLocation().getDistance(victim.getLocation()) * 0.3); NPC npc = (NPC) entity; - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (Entity t : RegionManager.getLocalPlayers(npc, 28)) { if (!CHAMBER.insideBorder(t.getLocation())) { continue; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java index 44f89be73..01d6de51b 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java @@ -82,7 +82,7 @@ public final class GWDKreeArraSwingHandler extends CombatSwingHandler { } else { ticks += (int) Math.ceil(entity.getLocation().getDistance(victim.getLocation()) * 0.3); NPC npc = (NPC) entity; - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (Entity t : RegionManager.getLocalPlayers(npc, 28)) { if (!CHAMBER.insideBorder(t.getLocation())) { continue; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java index 3d9404ac6..03e692898 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java @@ -58,7 +58,7 @@ public class GWDZilyanaSwingHandler extends CombatSwingHandler { state.setStyle(CombatStyle.MELEE); } else { NPC npc = (NPC) entity; - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (Entity t : RegionManager.getLocalPlayers(npc.getCenterLocation(), (npc.size() >> 1) + 2)) { if (t.getLocation().getX() < 2908 && t.isAttackable(npc, CombatStyle.MAGIC)) { list.add(new BattleState(entity, t)); diff --git a/Server/src/main/java/core/game/content/activity/gwd/GodWarsNPC.java b/Server/src/main/java/core/game/content/activity/gwd/GodWarsNPC.java index b8dfdd7e6..29e2d3ca5 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GodWarsNPC.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GodWarsNPC.java @@ -49,7 +49,7 @@ public final class GodWarsNPC extends AbstractNPC { @Override public List getPossibleTargets(Entity entity, int radius) { - List targets = new ArrayList<>(); + List targets = new ArrayList<>(20); for (Player player : RegionManager.getLocalPlayers(entity, radius)) { if (canSelectTarget(entity, player)) { targets.add(player); diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java index 5c06b2445..f2bd556d2 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java @@ -44,7 +44,7 @@ public class AlchemistZone extends MTAZone { /** * The players in the zone. */ - private static final List PLAYERS = new ArrayList<>(); + private static final List PLAYERS = new ArrayList<>(20); /** * The guardian. diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java index 9a415a541..f89d8e1a1 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java @@ -58,7 +58,7 @@ public class EnchantingZone extends MTAZone { /** * The players in the zone. */ - private static final List PLAYERS = new ArrayList<>(); + private static final List PLAYERS = new ArrayList<>(20); /** * The guardian. diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java index 03a70d40b..0e9b64921 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java @@ -38,7 +38,7 @@ public class GraveyardZone extends MTAZone { /** * The players in the zone. */ - private static final List PLAYERS = new ArrayList<>(); + private static final List PLAYERS = new ArrayList<>(20); /** * The runes rewarded by a chance. @@ -69,7 +69,7 @@ public class GraveyardZone extends MTAZone { if (PLAYERS.isEmpty()) { return true; } - List locs = new ArrayList<>(); + List locs = new ArrayList<>(20); for (Location l : GFX_POS) { if (RandomFunction.random(12) >= 8) { continue; diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java index 2652309ef..cd9e9ea6a 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java @@ -49,7 +49,7 @@ public class TelekineticZone extends MTAZone { /** * The mazes to choose from. */ - private final List mazes = new ArrayList<>(); + private final List mazes = new ArrayList<>(20); /** * The dynamic region. diff --git a/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java b/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java index ddbccc599..69d3c2ab8 100644 --- a/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java +++ b/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java @@ -31,7 +31,7 @@ public final class BalloonManager extends OptionHandler { /** * The list of dropped balloons. */ - private static final List balloons = new ArrayList<>(); + private static final List balloons = new ArrayList<>(20); /** * The count down time until droping. diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java index 492c68711..193276aac 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java @@ -28,7 +28,7 @@ public final class PCObjectHandler extends OptionHandler { //public boolean pcbotsSpawned = false; public boolean PCnBotsSpawned = false; public boolean PCiBotsSpawned = false; - public ArrayList playersJoined = new ArrayList<>(); + public ArrayList playersJoined = new ArrayList<>(20); @Override public Plugin newInstance(Object arg) throws Throwable { diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java index 4e0fbc6fe..3950c5401 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java @@ -60,12 +60,12 @@ public final class PestControlActivityPlugin extends ActivityPlugin { /** * The waiting players. */ - private final List waitingPlayers = new ArrayList<>(); + private final List waitingPlayers = new ArrayList<>(20); /** * The active game sessions. */ - private final List sessions = new ArrayList<>(); + private final List sessions = new ArrayList<>(20); /** * The game updating pulse. diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java index bf48fd08c..c63f0156c 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java @@ -51,7 +51,7 @@ public final class PestControlSession { /** * The barricade & gate objects. */ - private final List barricades = new ArrayList<>(); + private final List barricades = new ArrayList<>(20); /** * The amount of ticks. @@ -66,7 +66,7 @@ public final class PestControlSession { /** * List of attackable portals */ - private final List aportals = new ArrayList<>(); + private final List aportals = new ArrayList<>(20); /** * The portals. */ @@ -215,7 +215,7 @@ public final class PestControlSession { public void startGame(List waitingPlayers) { region.flagActive(); initBarricadesList(); - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (int i = 0; i < 4; i++) { list.add(i); } diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java index df1e13e86..d1f4741f3 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java @@ -110,7 +110,7 @@ public final class PCShifterNPC extends AbstractNPC { * @return The destination. */ private Location getDestination(Entity victim) { - List locations = new ArrayList<>(); + List locations = new ArrayList<>(20); int radius = 2; for (int x = -radius; x < radius + 1; x++) { for (int y = -radius; y < radius + 1; y++) { diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java b/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java index 4aabf0858..cf19fac01 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java @@ -671,7 +671,7 @@ public final class PCRewardInterface extends ComponentPlugin { public Item[] constructPack() { final int build = this == SEED_PACK || this == HERB_PACK ? RandomFunction.random(MIN_BUILD, MAX_BUILD) : RandomFunction.random(38, 43); int left = build; - List pack = new ArrayList<>(); + List pack = new ArrayList<>(20); int amt = 0; for (Item i : getReward()) { amt = this == SEED_PACK || this == HERB_PACK ? RandomFunction.random(1, 5) : RandomFunction.random(16, 25); diff --git a/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java b/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java index 173170d9f..ca6bcf5b9 100644 --- a/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java +++ b/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java @@ -45,7 +45,7 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { /** * The moving wheat. */ - private static final List WHEAT = new ArrayList<>(); + private static final List WHEAT = new ArrayList<>(20); /** * The pulse. diff --git a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java index ff93f6f97..89d22ae13 100644 --- a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java +++ b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java @@ -46,7 +46,7 @@ public final class TzhaarFightCavesPlugin extends ActivityPlugin { /** * The currently active NPCs. */ - public List activeNPCs = new ArrayList<>(); + public List activeNPCs = new ArrayList<>(20); /** * Constructs a new {@code TzhaarFightCavesPlugin} {@code Object}. diff --git a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java index 21e53844f..8d3918eb5 100644 --- a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java +++ b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java @@ -47,12 +47,12 @@ public final class TzhaarFightPitsPlugin extends ActivityPlugin { /** * The lobby list. */ - private static final List LOBBY_PLAYERS = new ArrayList<>(); + private static final List LOBBY_PLAYERS = new ArrayList<>(20); /** * The players in battle list. */ - private static final List WAR_PLAYERS = new ArrayList<>(); + private static final List WAR_PLAYERS = new ArrayList<>(20); /** * The interface id. diff --git a/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java b/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java index aad5e4556..bdb350fb7 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java @@ -36,7 +36,7 @@ public final class BarrelRoom extends MapZone implements Plugin { /** * The players list. */ - private static List players = new ArrayList<>(); + private static List players = new ArrayList<>(20); /** * The pulse. diff --git a/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java b/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java index a488c2f02..22bfa6110 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java @@ -101,7 +101,7 @@ public final class CatapultRoom extends MapZone implements Plugin { /** * The players in the catapult room. */ - private static List players = new ArrayList<>(); + private static List players = new ArrayList<>(20); /** * The current attack. diff --git a/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java b/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java index 926356cb8..d48145dcf 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java @@ -46,7 +46,7 @@ public final class CyclopesRoom extends MapZone implements Plugin { /** * The players in the room. */ - private static final List PLAYERS = new ArrayList<>(); + private static final List PLAYERS = new ArrayList<>(20); /** * The pulse. diff --git a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java index 84b93b614..0c8f487c7 100644 --- a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java +++ b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java @@ -166,7 +166,7 @@ public final class QuizMasterDialogue extends DialoguePlugin { private void display(QuizSet[] quiz) { QuizSet correct = quiz[0]; QuizSet wrong = quiz[1]; - List childs = new ArrayList<>(); + List childs = new ArrayList<>(20); childs.add(1); childs.add(2); childs.add(3); @@ -231,7 +231,7 @@ public final class QuizMasterDialogue extends DialoguePlugin { * @return the set. */ public static QuizSet[] getQuizSet() { - List sets = new ArrayList<>(); + List sets = new ArrayList<>(20); for (QuizSet s : values()) { sets.add(s); } diff --git a/Server/src/main/java/core/game/content/global/Bones.java b/Server/src/main/java/core/game/content/global/Bones.java index a86f1f71d..fc29a2b64 100644 --- a/Server/src/main/java/core/game/content/global/Bones.java +++ b/Server/src/main/java/core/game/content/global/Bones.java @@ -121,7 +121,7 @@ public enum Bones { * @return the ids. */ public static int[] getArray() { - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (int i : bones.keySet()) { list.add(i); } diff --git a/Server/src/main/java/core/game/content/global/shop/Shop.java b/Server/src/main/java/core/game/content/global/shop/Shop.java index 09ef84bf7..1135d5127 100644 --- a/Server/src/main/java/core/game/content/global/shop/Shop.java +++ b/Server/src/main/java/core/game/content/global/shop/Shop.java @@ -59,7 +59,7 @@ public class Shop { /** * Represents the list of shop viewers. */ - private final List viewers = new ArrayList<>(); + private final List viewers = new ArrayList<>(20); /** * Represents the title of the shop. diff --git a/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java b/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java index 8695b5c2d..26f26c878 100644 --- a/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java +++ b/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java @@ -97,7 +97,7 @@ public final class ShipCharter { */ Destination.OO_GLOG, Destination.SHIPYARD, /* Destination.PORT_TYRAS, */ Destination.CRANDOR }; - List childs = new ArrayList<>(); + List childs = new ArrayList<>(20); for (Destination destination : restrictions) { childs.add(destination.getXChild()); childs.add(destination.getNameChild()); diff --git a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java index 0fd20cb61..86d8f7099 100644 --- a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java +++ b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; public class ScoreboardManager { - public static List entries = new ArrayList<>(); + public static List entries = new ArrayList<>(20); public static void submit(Player player){ if(entries.size() == 5){ diff --git a/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java b/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java index 2a3551aa0..4c66e3b41 100644 --- a/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java +++ b/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java @@ -884,7 +884,7 @@ public class DeathMansionEvent extends HolidayEvent { public static List getGrimItems(Player player) { List items = player.getAttribute("grim-items", null); if (items == null) { - items = new ArrayList<>(); + items = new ArrayList<>(20); } player.setAttribute("grim-items", items); return items; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java index c1cad1f53..262ec28b8 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java @@ -152,7 +152,7 @@ public class DemonSlayer extends Quest { * @return the incantation. */ private final static String generateIncantation() { - List incantations = new ArrayList<>(); + List incantations = new ArrayList<>(20); for (String s : INCANTATIONS) { incantations.add(s); } diff --git a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java index 7ef370ce8..0c86708bf 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java @@ -257,7 +257,7 @@ public final class DragonSlayerCutscene extends CutscenePlugin { /** * Represents the active fires. */ - private List fires = new ArrayList<>(); + private List fires = new ArrayList<>(20); /** * Represents if the fires are done burning. diff --git a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java index 1fde217b6..a5023701d 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java @@ -741,7 +741,7 @@ public final class AvaDialogue extends DialoguePlugin { * @param remove the remove item. */ private void removeAll(Player player, Item add, Item remove) { - List containers = new ArrayList<>(); + List containers = new ArrayList<>(20); containers.add(player.getInventory()); containers.add(player.getEquipment()); containers.add(player.getBank()); diff --git a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java index ef7959115..12078a20b 100644 --- a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java @@ -92,12 +92,12 @@ public final class WaterfallPlugin extends OptionHandler { /** * The swimmer swimming. */ - private static final List SWIMMERS = new ArrayList<>(); + private static final List SWIMMERS = new ArrayList<>(20); /** * The ropes. */ - private static final List ROPES = new ArrayList<>(); + private static final List ROPES = new ArrayList<>(20); @Override public Plugin newInstance(Object arg) throws Throwable { diff --git a/Server/src/main/java/core/game/content/ttrail/ClueLevel.java b/Server/src/main/java/core/game/content/ttrail/ClueLevel.java index 546f3332a..9bc32478d 100644 --- a/Server/src/main/java/core/game/content/ttrail/ClueLevel.java +++ b/Server/src/main/java/core/game/content/ttrail/ClueLevel.java @@ -552,11 +552,11 @@ public enum ClueLevel { * @return the rewar */ public List getLoot(Player player) { - List items = new ArrayList<>(); - List ids = new ArrayList<>(); + List items = new ArrayList<>(20); + List ids = new ArrayList<>(20); items.addAll(Arrays.asList(DEFAULT_REWARDS)); items.addAll(Arrays.asList(this.getRewards())); - List rewards = new ArrayList<>(); + List rewards = new ArrayList<>(20); int size = RandomFunction.random(1, 6); if (this == HARD) { size = RandomFunction.random(4, 6); diff --git a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java b/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java index c8cfeb690..4fe1d3a11 100644 --- a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java +++ b/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java @@ -143,7 +143,7 @@ public abstract class ClueScrollPlugin extends MapZone implements Plugin } List organized = (List) ORGANIZED.get(clue.getLevel()); if (organized == null) { - organized = new ArrayList<>(); + organized = new ArrayList<>(20); } organized.add(clue); ZoneBuilder.configure(clue); diff --git a/Server/src/main/java/core/game/content/zone/DesertZone.java b/Server/src/main/java/core/game/content/zone/DesertZone.java index 3cec91ff4..6e0f6b1de 100644 --- a/Server/src/main/java/core/game/content/zone/DesertZone.java +++ b/Server/src/main/java/core/game/content/zone/DesertZone.java @@ -46,7 +46,7 @@ public final class DesertZone extends MapZone implements Plugin { /** * The players list. */ - private static final List PLAYERS = new ArrayList<>(); + private static final List PLAYERS = new ArrayList<>(20); /** * The water draining pulse. diff --git a/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java b/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java index 1769a8f4e..b182a7373 100644 --- a/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java +++ b/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java @@ -44,7 +44,7 @@ public class WildernessAreaZone extends MapZone implements Plugin { /** * The list of players in the arena. */ - private final List players = new ArrayList<>(); + private final List players = new ArrayList<>(20); /** * Constructs a new {@code WildernessAreaZone} {@code Object} diff --git a/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java b/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java index 15e36c2a7..a6b092e14 100644 --- a/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java +++ b/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java @@ -83,7 +83,7 @@ public final class WaterBirthDungeonZone extends MapZone implements Plugin eggs = new ArrayList<>(); + final List eggs = new ArrayList<>(20); NPC n = Repository.findNPC(new Location(2546, 10142, 0)); if (n != null && n.getId() == 2449) { eggs.add(n); @@ -113,7 +113,7 @@ public final class WaterBirthDungeonZone extends MapZone implements Plugin spawns = new ArrayList<>(); + final List spawns = new ArrayList<>(20); for (NPC n : eggs) { n.transform(n.getId() + 1); NPC spawn = NPC.create(2454, n.getLocation().transform(-1, 0, 0)); diff --git a/Server/src/main/java/core/game/interaction/OptionHandler.java b/Server/src/main/java/core/game/interaction/OptionHandler.java index 74feff999..1c531b543 100644 --- a/Server/src/main/java/core/game/interaction/OptionHandler.java +++ b/Server/src/main/java/core/game/interaction/OptionHandler.java @@ -69,7 +69,7 @@ public abstract class OptionHandler implements Plugin { */ public int[] getValidChildren(int wrapper) { final ObjectDefinition definition = ObjectDefinition.forId(wrapper); - final List list = new ArrayList<>(); + final List list = new ArrayList<>(20); if (definition.getChildrenIds() == null) { SystemLogger.logErr("Null child wrapper in option handler wrapperId=" + wrapper); return new int[] { wrapper }; diff --git a/Server/src/main/java/core/game/interaction/UseWithHandler.java b/Server/src/main/java/core/game/interaction/UseWithHandler.java index 735eb3b98..bd40edc62 100644 --- a/Server/src/main/java/core/game/interaction/UseWithHandler.java +++ b/Server/src/main/java/core/game/interaction/UseWithHandler.java @@ -82,7 +82,7 @@ public abstract class UseWithHandler implements Plugin { int key = id | type << 16; List handlers = HANDLERS.get(key); if (handlers == null) { - HANDLERS.put(key, handlers = new ArrayList<>()); + HANDLERS.put(key, handlers = new ArrayList<>(20)); } if (type == PLAYER_TYPE) { if (handler.allowedNodes == null) { @@ -204,7 +204,7 @@ public abstract class UseWithHandler implements Plugin { */ public int[] getValidChildren(int wrapper) { final ObjectDefinition definition = ObjectDefinition.forId(wrapper); - final List list = new ArrayList<>(); + final List list = new ArrayList<>(20); if (definition.getChildrenIds() == null) { SystemLogger.logErr("Null child wrapper in option handler wrapperId=" + wrapper); return new int[]{wrapper}; diff --git a/Server/src/main/java/core/game/interaction/item/CasketPlugin.java b/Server/src/main/java/core/game/interaction/item/CasketPlugin.java index 1b6d077c5..9291f5e2d 100644 --- a/Server/src/main/java/core/game/interaction/item/CasketPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/CasketPlugin.java @@ -49,7 +49,7 @@ public final class CasketPlugin extends OptionHandler { */ private ChanceItem getChanceItem(ChanceItem[] items) { final int chance = RandomFunction.random(100); - final List chances = new ArrayList<>(); + final List chances = new ArrayList<>(20); for (ChanceItem c : items) { if (chance > c.getChanceRate()) { chances.add(c); diff --git a/Server/src/main/java/core/game/interaction/item/toys/DiangoReclaimInterface.java b/Server/src/main/java/core/game/interaction/item/toys/DiangoReclaimInterface.java index 5165c7bb5..db4d87062 100644 --- a/Server/src/main/java/core/game/interaction/item/toys/DiangoReclaimInterface.java +++ b/Server/src/main/java/core/game/interaction/item/toys/DiangoReclaimInterface.java @@ -23,7 +23,7 @@ import java.util.Objects; @Initializable public class DiangoReclaimInterface extends ComponentPlugin { private static final int COMPONENT_ID = 468; - public static final List ITEMS = new ArrayList<>(); + public static final List ITEMS = new ArrayList<>(20); public static final Item[] HOLIDAY_ITEMS = {YoyoPlugin.YOYO, ReindeerHatPlugin.ReindeerHat, BasketofEggsEvent.RUBBER_CHICKEN,ZombieHeadPlugin.ZOMBIE_HEAD, new Item(6857), new Item(6856), new Item(6858), new Item(6859), new Item(6860), new Item(6861), new Item(6862), new Item(6863), new Item(9920), new Item(9921),new Item(9922), new Item(9923), new Item(9924), new Item(9925), new Item(11019), new Item(11020), new Item(11021), new Item(11022), new Item(11789), new Item(11949), new Item(12634), new Item(14076), new Item(14077), new Item(14081),new Item(14595), new Item(14602), new Item(14603), new Item(14605)}; //initialize the plugin, add lists of items to the ITEMS list... diff --git a/Server/src/main/java/core/game/node/entity/combat/CombatSpell.java b/Server/src/main/java/core/game/node/entity/combat/CombatSpell.java index e146d9ec3..d35be9bf2 100644 --- a/Server/src/main/java/core/game/node/entity/combat/CombatSpell.java +++ b/Server/src/main/java/core/game/node/entity/combat/CombatSpell.java @@ -110,7 +110,7 @@ public abstract class CombatSpell extends MagicSpell { * @return The list of targets. */ public List getMultihitTargets(Entity entity, Entity target, int max) { - List list = new ArrayList<>(); + List list = new ArrayList<>(20); list.add(target); boolean npc = target instanceof NPC; for (Entity e : npc ? RegionManager.getLocalNpcs(target, 1) : RegionManager.getLocalPlayers(target, 1)) { diff --git a/Server/src/main/java/core/game/node/entity/combat/equipment/DegradableEquipment.java b/Server/src/main/java/core/game/node/entity/combat/equipment/DegradableEquipment.java index e082366e2..35a900e8a 100644 --- a/Server/src/main/java/core/game/node/entity/combat/equipment/DegradableEquipment.java +++ b/Server/src/main/java/core/game/node/entity/combat/equipment/DegradableEquipment.java @@ -122,7 +122,7 @@ public abstract class DegradableEquipment implements Plugin { public DegradableEquipment newInstance(Object arg) { List equipment = EQUIPMENT[slot]; if (equipment == null) { - equipment = EQUIPMENT[slot] = new ArrayList<>(); + equipment = EQUIPMENT[slot] = new ArrayList<>(20); } equipment.add(this); return this; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java index 73ee3867c..2f2a92bbb 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java @@ -92,7 +92,7 @@ public final class SweepSpecialHandler extends MeleeSwingHandler implements Plug int x = vl.getX(); int y = vl.getY(); Direction dir = Direction.getDirection(x - entity.getLocation().getX(), y - entity.getLocation().getY()); - List l = new ArrayList<>(); + List l = new ArrayList<>(20); l.add(new BattleState(entity, victim)); for (Entity n : victim instanceof NPC ? RegionManager.getSurroundingNPCs(victim, 9, entity, victim) : RegionManager.getSurroundingPlayers(victim, 9, entity, victim)) { if (n instanceof Familiar) { diff --git a/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java b/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java index d0d4b779c..b1a37c197 100644 --- a/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java +++ b/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java @@ -15,7 +15,7 @@ public class SpellBlocks { if(blocks.get(spellId) != null){ blocks.get(spellId).add(toBlock); } else { - List blockslist = new ArrayList<>(); + List blockslist = new ArrayList<>(20); blockslist.add(toBlock); blocks.put(spellId,blockslist); } diff --git a/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java index 2af054451..087823be3 100644 --- a/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java +++ b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java @@ -113,7 +113,7 @@ public class AggressiveBehavior { * @return The list of possible targets. */ public List getPossibleTargets(Entity entity, int radius) { - List targets = new ArrayList<>(); + List targets = new ArrayList<>(20); for (Player player : RegionManager.getLocalPlayers(entity, radius)) { if (canSelectTarget(entity, player)) { targets.add(player); diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java index ddc2ba90e..2e69bbd77 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java @@ -210,7 +210,7 @@ public final class KalphiteQueenNPC extends AbstractNPC { * @return The targets array. */ private BattleState[] getRangeTargets(Entity e, Entity victim) { - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (Entity t : RegionManager.getLocalPlayers(victim, -1 + (int) e.getCenterLocation().getDistance(victim.getLocation()))) { if (t.isAttackable(e, CombatStyle.RANGE)) { list.add(new BattleState(e, t)); diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java index 49647df4c..c9ab3a858 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java @@ -268,7 +268,7 @@ public final class CorporealBeastNPC extends AbstractNPC { Location p = player.getLocation(); if (p.getX() >= l.getX() && p.getY() >= l.getY() && p.getX() < l.getX() + entity.size() && p.getY() < l.getY() + entity.size()) { if (stompTargets == null) { - stompTargets = new ArrayList<>(); + stompTargets = new ArrayList<>(20); } stompTargets.add(player); } diff --git a/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java b/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java index 4c910a25e..2d93498c0 100644 --- a/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java +++ b/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java @@ -40,17 +40,17 @@ public final class NPCDropTables { /** * The default drop table (holding the 100% drops). */ - private final List defaultTable = new ArrayList<>(); + private final List defaultTable = new ArrayList<>(20); /** * The charms drop table (holding the charm drops). */ - private final List charmTable = new ArrayList<>(); + private final List charmTable = new ArrayList<>(20); /** * The main drop table (holding the main drops). */ - private final List mainTable = new ArrayList<>(); + private final List mainTable = new ArrayList<>(20); /** * The NPC definitions. @@ -175,7 +175,7 @@ public final class NPCDropTables { if (player != null && npc.getProperties().isMultiZone() && (GrandExchangeDatabase.getDatabase().get(itemId) != null || item.getName().endsWith("charm")) && player.getCommunication().getClan() != null && player.getCommunication().isLootShare() && player.getCommunication().getLootRequirement().ordinal() >= player.getCommunication().getClan().getLootRequirement().ordinal() && !player.getIronmanManager().isIronman()) { Player looter = player; List players = RegionManager.getLocalPlayers(npc, 16); - List looters = new ArrayList<>(); + List looters = new ArrayList<>(20); for (Player p : players) { if (p != null && p.getCommunication().getClan() != null && p.getCommunication().getClan() == player.getCommunication().getClan() && p.getCommunication().isLootShare() && p.getCommunication().getLootRequirement().ordinal() >= p.getCommunication().getClan().getLootRequirement().ordinal() && npc.getImpactHandler().getImpactLog().containsKey(p)) { looters.add(p); diff --git a/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java b/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java index f71464d28..d77313b69 100644 --- a/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java +++ b/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java @@ -32,7 +32,7 @@ public final class RareDropTable { /** * The rare drop table. */ - private static final List TABLE = new ArrayList<>(); + private static final List TABLE = new ArrayList<>(20); /** diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java index 244ab622c..a9428c0f8 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java @@ -132,7 +132,7 @@ public final class DesertWyrmNPC extends Forager { * @return the object. */ public GameObject getClosestRock(Player player) { - List rocks = new ArrayList<>(); + List rocks = new ArrayList<>(20); for (int k = 0; k < 7; k++) { for (int i = 0; i < 4; i++) { Direction dir = Direction.get(i); diff --git a/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java index d2423351b..ecbcf43fb 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java @@ -64,7 +64,7 @@ public class BorkNPC extends AbstractNPC { /** * The list of the legion npc. */ - private final List legions = new ArrayList<>(); + private final List legions = new ArrayList<>(20); /** * If the legion is spawned. diff --git a/Server/src/main/java/core/game/node/entity/npc/other/StrayDogNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/StrayDogNPC.java index 8a1bfc658..1151d1cb9 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/StrayDogNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/StrayDogNPC.java @@ -39,7 +39,7 @@ public class StrayDogNPC extends AbstractNPC { /** * Represents the array list of players. */ - private List players = new ArrayList<>(); + private List players = new ArrayList<>(20); /** * Constructs a new {@code AlKharidWarriorPlugin} {@code Object}. diff --git a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java index b9b233b41..45948dab7 100644 --- a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java +++ b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java @@ -20,7 +20,7 @@ public class RevenantPlugin implements Plugin { /** * The revenants npc. */ - private static final List REVENANTS = new ArrayList<>(); + private static final List REVENANTS = new ArrayList<>(20); /** * The spawning locations. @@ -47,7 +47,7 @@ public class RevenantPlugin implements Plugin { public static void spawn() { int size = REVENANTS.size(); int left = MAX - size; - List taken = new ArrayList<>(); + List taken = new ArrayList<>(20); for (NPC n : REVENANTS) { taken.add(n.getProperties().getSpawnLocation()); } diff --git a/Server/src/main/java/core/game/node/entity/player/Player.java b/Server/src/main/java/core/game/node/entity/player/Player.java index 397be82be..700252aaf 100644 --- a/Server/src/main/java/core/game/node/entity/player/Player.java +++ b/Server/src/main/java/core/game/node/entity/player/Player.java @@ -604,7 +604,7 @@ public class Player extends Entity { boolean gravestone = graveManager.generateable() && getIronmanManager().getMode() != IronmanMode.ULTIMATE; int seconds = graveManager.getType().getDecay() * 60; int ticks = (1000 * seconds) / 600; - List items = new ArrayList<>(); + List items = new ArrayList<>(20); for (Item item : c[1].toArray()) { if (item != null) { GroundItem ground; @@ -1234,7 +1234,7 @@ public class Player extends Entity { */ public List> getLogoutPlugins() { if (logoutPlugins == null) { - logoutPlugins = new ArrayList<>(); + logoutPlugins = new ArrayList<>(20); } return logoutPlugins; } diff --git a/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java b/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java index d9b276cbc..ee0dfa9e2 100644 --- a/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java +++ b/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java @@ -35,7 +35,7 @@ public final class LoginConfiguration { /** * The login plugins. */ - private static final List> LOGIN_PLUGINS = new ArrayList<>(); + private static final List> LOGIN_PLUGINS = new ArrayList<>(20); /** * The lobby pane component. diff --git a/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java b/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java index 7503b879d..8457e8f5f 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java @@ -46,7 +46,7 @@ public class BankPinManager { /** * The digits. */ - private final List digits = new ArrayList<>(); + private final List digits = new ArrayList<>(20); /** * The bank pin. diff --git a/Server/src/main/java/core/game/node/entity/player/link/WarningMessages.java b/Server/src/main/java/core/game/node/entity/player/link/WarningMessages.java index 7ebf4d3f3..fad53a42b 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/WarningMessages.java +++ b/Server/src/main/java/core/game/node/entity/player/link/WarningMessages.java @@ -22,7 +22,7 @@ public final class WarningMessages { /** * Represents the warning messages. */ - private final List messages = new ArrayList<>(); + private final List messages = new ArrayList<>(20); /** * Method used to open the warning messages. diff --git a/Server/src/main/java/core/game/node/entity/player/link/emote/EmoteManager.java b/Server/src/main/java/core/game/node/entity/player/link/emote/EmoteManager.java index 9d8d0cf51..7f2e691f9 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/emote/EmoteManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/emote/EmoteManager.java @@ -17,7 +17,7 @@ public class EmoteManager { /** * The list of unlocked emotes. */ - private final List emotes = new ArrayList<>(); + private final List emotes = new ArrayList<>(20); /** * The player. diff --git a/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java index 16911d946..e71e7914f 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java +++ b/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java @@ -26,7 +26,7 @@ public final class Prayer { /** * Represents the list of active prayers. */ - private final List active = new ArrayList<>(); + private final List active = new ArrayList<>(20); /** * Represents the current draining task. diff --git a/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeModule.java b/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeModule.java index 06b0fee22..f55e121e6 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeModule.java +++ b/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeModule.java @@ -443,7 +443,7 @@ public final class TradeModule implements RequestModule { * @return the split item array. */ private Item[] splitList(Item[] items, int min, int max) { - List list = new ArrayList<>(); + List list = new ArrayList<>(20); for (int i = min; i < max; i++) { if (items[i] == null) { continue; diff --git a/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java b/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java index 599220643..b62c23ea4 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java +++ b/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java @@ -83,7 +83,7 @@ public enum PKTitle { */ public static PKTitle[] getTitles(Player player) { int kills = player.getSavedData().getSpawnData().getKills(); - List titles = new ArrayList<>(); + List titles = new ArrayList<>(20); for (PKTitle t : values()) { if (kills >= t.getKills()) { titles.add(t); diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java index 84e307361..550f4e4be 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java @@ -48,7 +48,7 @@ public final class BuildRoomDialogue extends DialoguePlugin { /** * The boundaries of the room to build. */ - private List boundaries = new ArrayList<>(); + private List boundaries = new ArrayList<>(20); /** * The room we're building. diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java index 2c722bc3b..e9fb254cc 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java @@ -284,7 +284,7 @@ public final class GatheringSkillPulse extends SkillPulse { // Calculate a random gem for the player else if (isMiningGems) { int random = RandomFunction.random(100); - List gems = new ArrayList<>(); + List gems = new ArrayList<>(20); if (random < 2) { gems.add(1617); } else if (random < 25) { diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java b/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java index 652591975..18574e36c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java @@ -437,7 +437,7 @@ public enum MiningNode{ - public static List gemRockGems = new ArrayList<>(); + public static List gemRockGems = new ArrayList<>(20); static { gemRockGems.add(new WeightedChanceItem(1625, 1, 60)); //uncut Opal gemRockGems.add(new WeightedChanceItem(1627, 1, 30)); //uncut Jade diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java index e038a9111..399be025a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java @@ -137,7 +137,7 @@ public final class DeadfallSetting extends TrapSetting { * @return the locations. */ private List getLocations(GameObject object) { - List locs = new ArrayList<>(); + List locs = new ArrayList<>(20); if (object.getDirection() == Direction.NORTH) { locs.add(object.getLocation().transform(1, -1, 0)); locs.add(object.getLocation().transform(1, 1, 0)); diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java index fc0d49554..4ed193c38 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java @@ -18,7 +18,7 @@ public final class HunterManager { /** * The list of active traps. */ - private final List traps = new ArrayList<>(); + private final List traps = new ArrayList<>(20); /** * The player instance. diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetTypes.java b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetTypes.java index 410c4bfc3..0d4515fff 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetTypes.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetTypes.java @@ -37,7 +37,7 @@ public enum BNetTypes { /** * The implings. */ - private static final List IMPLINGS = new ArrayList<>(); + private static final List IMPLINGS = new ArrayList<>(20); /** * The node. diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/CombinationRune.java b/Server/src/main/java/core/game/node/entity/skill/magic/CombinationRune.java index 8b29ba69b..a5d351c23 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/CombinationRune.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/CombinationRune.java @@ -20,7 +20,7 @@ public enum CombinationRune { } public static List eligibleFor(Runes rune){ - List runes = new ArrayList<>(); + List runes = new ArrayList<>(20); for(CombinationRune r : CombinationRune.values()){ for(Runes ru : r.types){ if(ru == rune){ diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java index 2035786d1..ba15156cc 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java @@ -229,7 +229,7 @@ public abstract class MagicSpell implements Plugin { if (runes == null) { return true; } - List toRemove = new ArrayList<>(); + List toRemove = new ArrayList<>(20); for (Item item : runes) { if (!hasRune(p, item, toRemove, message)) { return false; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java index 4d24c5219..1ce1e9b25 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java @@ -37,7 +37,7 @@ public final class SmokeDungeon extends MapZone implements Plugin { /** * The players list. */ - private static final List PLAYERS = new ArrayList<>(); + private static final List PLAYERS = new ArrayList<>(20); /** * The tick delay until the next effect. diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java index f72e3e7de..12030c4ad 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java @@ -105,7 +105,7 @@ public abstract class Familiar extends NPC implements Plugin { /** * The invisible familiar boosts. */ - protected List boosts = new ArrayList<>(); + protected List boosts = new ArrayList<>(20); /** * The attack style. diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java index 50c302832..122f4d212 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java @@ -65,7 +65,7 @@ public final class FamiliarManager { /** * The list of insured pets. */ - private List insuredPets = new ArrayList<>(); + private List insuredPets = new ArrayList<>(20); /** * Constructs a new {@code FamiliarManager} {@code Object}. diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java b/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java index f3b33af0b..09290c5ef 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java @@ -30,7 +30,7 @@ public class PickableDoorHandler extends OptionHandler { */ private static final Item LOCK_PICK = new Item(1523); - private static final List pickableDoors = new ArrayList<>(); + private static final List pickableDoors = new ArrayList<>(20); private static final int[] DOORS = new int[]{42028, 2550, 2551, 2554, 2555, 2556, 2557, 2558, 2559, 5501, 7246, 9565, 13314, 13317, 13320, 13323, 13326, 13344, 13345, 13346, 13347, 13348, 13349, 15759, 34005, 34805, 34806, 34812}; diff --git a/Server/src/main/java/core/game/node/item/GroundItemManager.java b/Server/src/main/java/core/game/node/item/GroundItemManager.java index 4b34e34e2..fc5d797ad 100644 --- a/Server/src/main/java/core/game/node/item/GroundItemManager.java +++ b/Server/src/main/java/core/game/node/item/GroundItemManager.java @@ -21,7 +21,7 @@ public final class GroundItemManager { /** * The list of ground items. */ - private static final List GROUND_ITEMS = new ArrayList<>(); + private static final List GROUND_ITEMS = new ArrayList<>(20); /** * Creates a ground item. diff --git a/Server/src/main/java/core/game/system/SystemConfig.java b/Server/src/main/java/core/game/system/SystemConfig.java index a98bb4e0d..da895405c 100644 --- a/Server/src/main/java/core/game/system/SystemConfig.java +++ b/Server/src/main/java/core/game/system/SystemConfig.java @@ -21,7 +21,7 @@ public class SystemConfig { /** * The list of beta user names. */ - private final List betaUsers = new ArrayList<>(); + private final List betaUsers = new ArrayList<>(20); /** * Constructs a new {@Code SystemConfig} {@Code Object} @@ -102,11 +102,11 @@ public class SystemConfig { */ public List split(String data, String regex) { if (!data.contains(regex)) { - List split = new ArrayList<>(); + List split = new ArrayList<>(20); split.add(data); return split; } - List split = new ArrayList<>(); + List split = new ArrayList<>(20); String[] tokens = data.trim().split(regex); for (String s : tokens) { split.add(s); diff --git a/Server/src/main/java/core/game/system/command/CommandSet.java b/Server/src/main/java/core/game/system/command/CommandSet.java index 2263fe75e..98cf63265 100644 --- a/Server/src/main/java/core/game/system/command/CommandSet.java +++ b/Server/src/main/java/core/game/system/command/CommandSet.java @@ -42,7 +42,7 @@ public enum CommandSet { /** * Represents the list of linked plugins with this command set. */ - private final List plugins = new ArrayList<>(); + private final List plugins = new ArrayList<>(20); /** * Constructs a new {@code CommandSet} {@code Object}. diff --git a/Server/src/main/java/core/game/system/communication/CommunicationInfo.java b/Server/src/main/java/core/game/system/communication/CommunicationInfo.java index 28fefd434..2dee6f8ae 100644 --- a/Server/src/main/java/core/game/system/communication/CommunicationInfo.java +++ b/Server/src/main/java/core/game/system/communication/CommunicationInfo.java @@ -43,7 +43,7 @@ public final class CommunicationInfo { /** * The list of blocked players. */ - private final List blocked = new ArrayList<>(); + private final List blocked = new ArrayList<>(20); /** * The player's clan name. diff --git a/Server/src/main/java/core/game/system/monitor/MessageLog.java b/Server/src/main/java/core/game/system/monitor/MessageLog.java index 36cb01385..f01ae34cf 100644 --- a/Server/src/main/java/core/game/system/monitor/MessageLog.java +++ b/Server/src/main/java/core/game/system/monitor/MessageLog.java @@ -62,7 +62,7 @@ public class MessageLog { */ public MessageLog(int capacity, boolean uniqueLogging) { this.capacity = capacity; - this.messages = new ArrayList<>(); + this.messages = new ArrayList<>(20); this.uniqueLogging = uniqueLogging; } diff --git a/Server/src/main/java/core/game/system/mysql/SQLTable.java b/Server/src/main/java/core/game/system/mysql/SQLTable.java index 9daedc144..c4140599a 100644 --- a/Server/src/main/java/core/game/system/mysql/SQLTable.java +++ b/Server/src/main/java/core/game/system/mysql/SQLTable.java @@ -41,7 +41,7 @@ public final class SQLTable { * @return The columns. */ public List getChanged() { - List updated = new ArrayList<>(); + List updated = new ArrayList<>(20); for (int i = 0; i < columns.length; i++) { SQLColumn column = columns[i]; if (column.isChanged()) { diff --git a/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java b/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java index 0fd2fc084..4b6a77456 100644 --- a/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java +++ b/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java @@ -46,7 +46,7 @@ public class PlayerLogSQLHandler extends SQLEntryHandler { if (connection.prepareStatement("SELECT * FROM " + table + " WHERE username='" + value + "' LIMIT 1").executeQuery().next()) { String b = "SET "; int size = 0; - List columns = new ArrayList<>(); + List columns = new ArrayList<>(20); for (int i = 0; i < MESSAGE_COLUMNS.length; i++) { if (!entry.getLogs()[i].getMessages().isEmpty()) { b += MESSAGE_COLUMNS[i] + " = CONCAT(" + MESSAGE_COLUMNS[i] + ", ?)" + (i == MESSAGE_COLUMNS.length - 1 ? "" : ","); diff --git a/Server/src/main/java/core/game/world/map/Region.java b/Server/src/main/java/core/game/world/map/Region.java index d79b2980a..44a244124 100644 --- a/Server/src/main/java/core/game/world/map/Region.java +++ b/Server/src/main/java/core/game/world/map/Region.java @@ -53,12 +53,12 @@ public class Region { /** * The region zones lying in this region. */ - private final List regionZones = new ArrayList<>(); + private final List regionZones = new ArrayList<>(20); /** * The music zones lying in this region. */ - private final List musicZones = new ArrayList<>(); + private final List musicZones = new ArrayList<>(20); /** * If the region is active. diff --git a/Server/src/main/java/core/game/world/map/RegionChunk.java b/Server/src/main/java/core/game/world/map/RegionChunk.java index 87723bfd1..98be34994 100644 --- a/Server/src/main/java/core/game/world/map/RegionChunk.java +++ b/Server/src/main/java/core/game/world/map/RegionChunk.java @@ -62,7 +62,7 @@ public class RegionChunk { /** * The update flags. */ - private List> flags = new ArrayList<>(); + private List> flags = new ArrayList<>(20); /** * Constructs a new {@code RegionChunk} {@code Object}. diff --git a/Server/src/main/java/core/game/world/map/RegionManager.java b/Server/src/main/java/core/game/world/map/RegionManager.java index 985b9e4d1..0be48460a 100644 --- a/Server/src/main/java/core/game/world/map/RegionManager.java +++ b/Server/src/main/java/core/game/world/map/RegionManager.java @@ -412,7 +412,7 @@ public final class RegionManager { * @return the list. */ public static List getLocalEntitys(Location location, int distance){ - List entitys = new ArrayList<>(); + List entitys = new ArrayList<>(20); entitys.addAll(getLocalNpcs(location, distance)); entitys.addAll(getLocalPlayers(location, distance)); return entitys; @@ -626,7 +626,7 @@ public final class RegionManager { */ public static List getRegionPlayers(int regionId) { Region r = forId(regionId); - List players = new ArrayList<>(); + List players = new ArrayList<>(20); for (RegionPlane plane : r.getPlanes()) { players.addAll(plane.getPlayers()); } diff --git a/Server/src/main/java/core/game/world/map/build/DynamicRegion.java b/Server/src/main/java/core/game/world/map/build/DynamicRegion.java index 6076a9bfe..db9ee4944 100644 --- a/Server/src/main/java/core/game/world/map/build/DynamicRegion.java +++ b/Server/src/main/java/core/game/world/map/build/DynamicRegion.java @@ -27,7 +27,7 @@ public final class DynamicRegion extends Region { /** * The reserved areas. */ - private static final List RESERVED_AREAS = new ArrayList<>(); + private static final List RESERVED_AREAS = new ArrayList<>(20); /** * The region id of the copied region. @@ -113,7 +113,7 @@ public final class DynamicRegion extends Region { ZoneBorders border = findZoneBorders((copy.getNorthEastX() - copy.getSouthWestX()) >> 3, (copy.getNorthEastY() - copy.getSouthWestY()) >> 3); RESERVED_AREAS.add(border); Location l = Location.create(border.getSouthWestX(), border.getSouthWestY(), 0); - List regions = new ArrayList<>(); + List regions = new ArrayList<>(20); for (int x = copy.getSouthWestX() >> 6; x < copy.getNorthEastX() >> 6; x++) { for (int y = copy.getSouthWestY() >> 6; y < copy.getNorthEastY() >> 6; y++) { int regionId = x << 8 | y; diff --git a/Server/src/main/java/core/game/world/map/path/DumbPathfinder.java b/Server/src/main/java/core/game/world/map/path/DumbPathfinder.java index e4b8e6d5e..0080f3480 100644 --- a/Server/src/main/java/core/game/world/map/path/DumbPathfinder.java +++ b/Server/src/main/java/core/game/world/map/path/DumbPathfinder.java @@ -41,7 +41,7 @@ public final class DumbPathfinder extends Pathfinder { z = start.getZ(); x = start.getX(); y = start.getY(); - List points = new ArrayList<>(); + List points = new ArrayList<>(20); path.setSuccesful(true); while (x != end.getX() || y != end.getY()) { Direction[] directions = getDirection(x, y, end); diff --git a/Server/src/main/java/core/game/world/map/path/ProjectilePathfinder.java b/Server/src/main/java/core/game/world/map/path/ProjectilePathfinder.java index 79afec84b..d20b96c22 100644 --- a/Server/src/main/java/core/game/world/map/path/ProjectilePathfinder.java +++ b/Server/src/main/java/core/game/world/map/path/ProjectilePathfinder.java @@ -40,7 +40,7 @@ public final class ProjectilePathfinder extends Pathfinder { z = start.getZ(); x = start.getX(); y = start.getY(); - List points = new ArrayList<>(); + List points = new ArrayList<>(20); path.setSuccesful(true); while (x != end.getX() || y != end.getY()) { Direction[] directions = getDirection(x, y, end); diff --git a/Server/src/main/java/core/game/world/map/zone/ZoneBorders.java b/Server/src/main/java/core/game/world/map/zone/ZoneBorders.java index 6b2c1bc45..cb1bd8917 100644 --- a/Server/src/main/java/core/game/world/map/zone/ZoneBorders.java +++ b/Server/src/main/java/core/game/world/map/zone/ZoneBorders.java @@ -168,7 +168,7 @@ public final class ZoneBorders { * @return The region ids. */ public List getRegionIds() { - List regionIds = new ArrayList<>(); + List regionIds = new ArrayList<>(20); int neX = (northEastX >> 6) + 1; int neY = (northEastY >> 6) + 1; for (int x = southWestX >> 6; x < neX; x++) { @@ -239,7 +239,7 @@ public final class ZoneBorders { */ public void addException(ZoneBorders exception) { if (exceptions == null) { - this.exceptions = new ArrayList<>(); + this.exceptions = new ArrayList<>(20); } exceptions.add(exception); } diff --git a/Server/src/main/java/core/game/world/map/zone/ZoneMonitor.java b/Server/src/main/java/core/game/world/map/zone/ZoneMonitor.java index 626623697..e5256624d 100644 --- a/Server/src/main/java/core/game/world/map/zone/ZoneMonitor.java +++ b/Server/src/main/java/core/game/world/map/zone/ZoneMonitor.java @@ -27,12 +27,12 @@ public final class ZoneMonitor { /** * The currently entered zones. */ - private final List zones = new ArrayList<>(); + private final List zones = new ArrayList<>(20); /** * The currently entered music zones. */ - private final List musicZones = new ArrayList<>(); + private final List musicZones = new ArrayList<>(20); /** * Constructs a new {@code ZoneMonitor} {@code Object}. diff --git a/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java b/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java index 017ec8b7e..2ccab50a8 100644 --- a/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java +++ b/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java @@ -121,7 +121,7 @@ public final class WildernessZone extends MapZone { boolean gravestone = player.getGraveManager().generateable() && player.getIronmanManager().getMode() != IronmanMode.ULTIMATE && !(killer instanceof Player); int seconds = player.getGraveManager().getType().getDecay() * 60; int ticks = (1000 * seconds) / 600; - List items = new ArrayList<>(); + List items = new ArrayList<>(20); for (Item item : c[1].toArray()) { if (item != null) { GroundItem ground; diff --git a/Server/src/main/java/core/gui/tab/PlayerTab.java b/Server/src/main/java/core/gui/tab/PlayerTab.java index 5aefe6844..9021eb0d8 100644 --- a/Server/src/main/java/core/gui/tab/PlayerTab.java +++ b/Server/src/main/java/core/gui/tab/PlayerTab.java @@ -28,7 +28,7 @@ public class PlayerTab extends ConsoleTab { /** * The list of player names to search through. */ - private final List playerNames = new ArrayList<>(); + private final List playerNames = new ArrayList<>(20); /** * The player name text field. diff --git a/Server/src/main/java/core/gui/tab/UtilityTab.java b/Server/src/main/java/core/gui/tab/UtilityTab.java index 7ef3ac48a..04fcb8f70 100644 --- a/Server/src/main/java/core/gui/tab/UtilityTab.java +++ b/Server/src/main/java/core/gui/tab/UtilityTab.java @@ -46,7 +46,7 @@ public final class UtilityTab extends ConsoleTab { /** * The list of players. */ - private final List players = new ArrayList<>(); + private final List players = new ArrayList<>(20); /** * The mapping of ips & their users. @@ -280,7 +280,7 @@ public final class UtilityTab extends ConsoleTab { } } } - List formats = new ArrayList<>(); + List formats = new ArrayList<>(20); for (int i = mostWealthy.length - 1; i >= 0; i--) { Object[] info = mostWealthy[i]; if (info != null && info[0] != null) { @@ -331,7 +331,7 @@ public final class UtilityTab extends ConsoleTab { Map map = new HashMap<>(); for (Player p : players) { p.getAnimator(); - List containers = new ArrayList<>(); + List containers = new ArrayList<>(20); containers.add(p.getInventory()); containers.add(p.getBank()); containers.add(p.getEquipment()); @@ -346,7 +346,7 @@ public final class UtilityTab extends ConsoleTab { map.put(p.getName(), amount); } } - List formats = new ArrayList<>(); + List formats = new ArrayList<>(20); for (Map.Entry entry : map.entrySet()) { formats.add("Player name=" + entry.getKey() + ", contained a total of " + entry.getValue() + " " + item.getName() + "."); } @@ -443,7 +443,7 @@ public final class UtilityTab extends ConsoleTab { * Checks the staff. */ public void staffScanner() { - List staff = new ArrayList<>(); + List staff = new ArrayList<>(20); for (Player player : players) { if (player.getDetails().getRights() != Rights.REGULAR_PLAYER) { staff.add(player.getName() + " - " + StringUtils.formatDisplayName(player.getDetails().getRights().toString())); diff --git a/Server/src/main/java/core/net/IoSession.java b/Server/src/main/java/core/net/IoSession.java index bca36b403..231b2c4c5 100644 --- a/Server/src/main/java/core/net/IoSession.java +++ b/Server/src/main/java/core/net/IoSession.java @@ -51,7 +51,7 @@ public class IoSession { /** * The currently queued writing data. */ - private List writingQueue = new ArrayList<>(); + private List writingQueue = new ArrayList<>(20); /** * The currently queued reading data. diff --git a/Server/src/main/java/core/net/amsc/WorldStatistics.java b/Server/src/main/java/core/net/amsc/WorldStatistics.java index 7a6d6b90e..bbae465f9 100644 --- a/Server/src/main/java/core/net/amsc/WorldStatistics.java +++ b/Server/src/main/java/core/net/amsc/WorldStatistics.java @@ -17,7 +17,7 @@ public final class WorldStatistics { /** * The list of players connected to this world. */ - private final List players = new ArrayList<>(); + private final List players = new ArrayList<>(20); /** * Constructs a new {@code WorldStatistics} {@Code Object} diff --git a/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java b/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java index 2835d77e9..8337471a8 100644 --- a/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java +++ b/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java @@ -22,7 +22,7 @@ public final class BuildDynamicScene implements OutgoingPacket regionIds = new ArrayList<>(); + List regionIds = new ArrayList<>(20); Player player = context.getPlayer(); buffer.putLEShortA(player.getLocation().getSceneX()); buffer.putLEShortA(player.getLocation().getRegionX()); diff --git a/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java b/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java index f008d3c17..bfa1c1f1f 100644 --- a/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java +++ b/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java @@ -7,7 +7,7 @@ import java.util.List; public class Managers { - private static List plugins = new ArrayList<>(); + private static List plugins = new ArrayList<>(20); public static void register(ManagerPlugin plugin){ if(plugin != null){ plugins.add(plugin); diff --git a/Server/src/main/java/core/tools/RandomFunction.java b/Server/src/main/java/core/tools/RandomFunction.java index a752248d9..1bc819331 100644 --- a/Server/src/main/java/core/tools/RandomFunction.java +++ b/Server/src/main/java/core/tools/RandomFunction.java @@ -152,7 +152,7 @@ public class RandomFunction { } final int random = random((int) total); double subTotal = 0; - List choices = new ArrayList<>(); + List choices = new ArrayList<>(20); for (ChanceItem item : items) { choices.add(item); } @@ -167,8 +167,8 @@ public class RandomFunction { } public static List rollChanceTable(boolean atLeastOne,List table){ - final List rewards = new ArrayList<>(); - final List always_rewards = new ArrayList<>(); + final List rewards = new ArrayList<>(20); + final List always_rewards = new ArrayList<>(20); final List chanceTable = new ArrayList(table); boolean isAllAlways = false; if(table.stream().filter(item -> item.getChanceRate() == 1).count() == table.size()){ diff --git a/Server/src/main/java/plugin/drops/DropPlugins.java b/Server/src/main/java/plugin/drops/DropPlugins.java index ba0eb25bc..8eeddb0ce 100644 --- a/Server/src/main/java/plugin/drops/DropPlugins.java +++ b/Server/src/main/java/plugin/drops/DropPlugins.java @@ -9,9 +9,9 @@ import java.util.List; public class DropPlugins { public static HashMap> plugins = new HashMap<>(); - public static List globalPlugins = new ArrayList<>(); + public static List globalPlugins = new ArrayList<>(20); public static List getDrops(int npc_id){ - List drops = new ArrayList<>(); + List drops = new ArrayList<>(20); List toHandle = plugins.get(npc_id); if(toHandle != null) { for (DropPlugin plugin : toHandle) { @@ -30,7 +30,7 @@ public class DropPlugins { if(plugin.accepted_npcs.length > 0) { Arrays.stream(plugin.accepted_npcs).forEach(id -> { if (plugins.get(id) == null) { - List newlist = new ArrayList<>(); + List newlist = new ArrayList<>(20); plugins.putIfAbsent(id, newlist); } plugins.get(id).add(plugin); diff --git a/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java index 366281a7d..a5e57000b 100644 --- a/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java +++ b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java @@ -18,7 +18,7 @@ public class MysteryBoxDropper extends DropPlugin { //percentage chance of it dropping, between 1 and 100. private int chance = 15; - List drops = new ArrayList<>(); //the list of dropped items + List drops = new ArrayList<>(20); //the list of dropped items //standard way to initialize a drop plugin @Override diff --git a/Server/src/main/java/rs09/game/ai/general/scriptrepository/Script.java b/Server/src/main/java/rs09/game/ai/general/scriptrepository/Script.java index 842cbb58a..4342dfa4b 100644 --- a/Server/src/main/java/rs09/game/ai/general/scriptrepository/Script.java +++ b/Server/src/main/java/rs09/game/ai/general/scriptrepository/Script.java @@ -11,8 +11,8 @@ import java.util.Map; public abstract class Script { public ScriptAPI scriptAPI; - public ArrayList inventory = new ArrayList<>(); - public ArrayList equipment = new ArrayList<>(); + public ArrayList inventory = new ArrayList<>(20); + public ArrayList equipment = new ArrayList<>(20); public Map skills = new HashMap<>(); diff --git a/Server/src/main/java/rs09/game/ai/pvmbots/PvMBots.java b/Server/src/main/java/rs09/game/ai/pvmbots/PvMBots.java index cff8cee53..a63635bc8 100644 --- a/Server/src/main/java/rs09/game/ai/pvmbots/PvMBots.java +++ b/Server/src/main/java/rs09/game/ai/pvmbots/PvMBots.java @@ -33,7 +33,7 @@ public class PvMBots extends AIPlayer { public List FindTargets(Entity entity, int radius) { - List targets = new ArrayList<>(); + List targets = new ArrayList<>(20); Object[] localNPCs = RegionManager.getLocalNpcs(entity,radius).toArray(); int length = localNPCs.length; if(length > 5){length = 5;} diff --git a/Server/src/main/java/rs09/game/ai/wilderness/WildernessBot.java b/Server/src/main/java/rs09/game/ai/wilderness/WildernessBot.java index e8dd001cd..d73ce95b2 100644 --- a/Server/src/main/java/rs09/game/ai/wilderness/WildernessBot.java +++ b/Server/src/main/java/rs09/game/ai/wilderness/WildernessBot.java @@ -53,7 +53,7 @@ public class WildernessBot extends AIPlayer { public List FindTargets(Entity entity, int radius) { - List targets = new ArrayList<>(); + List targets = new ArrayList<>(20); for (Player player : RegionManager.getLocalPlayers(entity, radius)) { { if (checkValidTargets(player)) targets.add(player);