diff --git a/trunk/dist/game/data/stats/skills/00300-00399.xml b/trunk/dist/game/data/stats/skills/00300-00399.xml index 79441a9b1f..c084238b3e 100644 --- a/trunk/dist/game/data/stats/skills/00300-00399.xml +++ b/trunk/dist/game/data/stats/skills/00300-00399.xml @@ -2392,7 +2392,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/00400-00499.xml b/trunk/dist/game/data/stats/skills/00400-00499.xml index 6b02f7eab4..c4d807733c 100644 --- a/trunk/dist/game/data/stats/skills/00400-00499.xml +++ b/trunk/dist/game/data/stats/skills/00400-00499.xml @@ -2974,10 +2974,10 @@ -114 -117 -119 -121 -124 -126 -129 -131 -133 -136 -138 -140 -142 -144 -146 -148 -150 -152 -154 -156 -157 -159 -160 -162 -163 -164 -166 -167
600 600 600 600 600 600 600 600 600 600 700 700 700 700 700 700 700 700 700 700 800 800 800 800 800 800 800 800
47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
- 46 47 48 50 50 51 52 53 55 56 57 58 60 61 61 62 63 65 66 67 68 69 70 71 72 73 74 75
+ 46 47 48 50 50 51 52 53 55 56 57 58 60 61 61 62 63 65 66 67 68 69 70 71 72 73 74 75
742 782 823 866 910 955 1002 1050 1100 1150 1202 1255 1309 1364 1420 1476 1531 1592 1651 1710 1770 1830 1891 1951 2012 2072 2132 2192
2212 2231 2251 2271 2291 2310 2330 2350 2370 2389 2409 2429 2449 2468 2488 2508 2528 2547 2567 2587 2607 2626 2646 2666 2686 2705 2725 2745 2765 2784
- 73 72 71 69 68 67 66 64 63 62 61 59 58 57 56 54 53 52 50 49 48 47 45 44 43 42 40 39 38 37
+ 73 72 71 69 68 67 66 64 63 62 61 59 58 57 56 54 53 52 50 49 48 47 45 44 43 42 40 39 38 37
2196 2200 2204 2209 2213 2217 2222 2226 2230 2234 2239 2243 2247 2252 2256 2260 2265 2269 2273 2277 2282 2286 2290 2295 2299 2303 2308 2312 2316 2320
2230 2268 2306 2345 2383 2421 2460 2498 2536 2575 2613 2651 2689 2728 2766 2804 2843 2881 2919 2958 2996 3034 3072 3111 3149 3187 3226 3264 3302 3341
1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50
@@ -2992,7 +2992,7 @@ - + @@ -3003,7 +3003,7 @@ - + @@ -3035,7 +3035,7 @@ -183 -188 -193 -198 -203 -208 -213 -218 -223 -228 -233 -237 -242 -247 -252 -257 -261 -266 -271 -275 -279 -284 -288 -292 -296 -300 -304 -307 -311 -314 -317 -320 -323 -326 -328 -331 -333
600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 700 700 700 700 700 700 700 700 700 700 800 800 800 800 800 800 800 800
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
- 25 26 27 27 28 29 30 30 31 32 33 34 35 35 36 37 38 38 39 40 41 42 43 43 44 45 45 46 47 48 48 49 50 51 51 52 53
+ 25 26 27 27 28 29 30 30 31 32 33 34 35 35 36 37 38 38 39 40 41 42 43 43 44 45 45 46 47 48 48 49 50 51 51 52 53
16 22 29 35 41 48 54 60 67 73 79 86 92 98 105 111 117 124 130 136 143 149 155 162 168 174 181 187 193 200
71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
17 25 33 40 48 56 63 71 79 86 94 102 109 117 125 132 140 148 155 163 171 178 186 194 201 209 217 224 232 240
@@ -3057,7 +3057,7 @@ - + @@ -3110,7 +3110,7 @@ -266 -279 -288 -296 -304 -311 -317 -323 -328 -333
600 700 700 700 700 700 800 800 800 800
55 58 60 62 64 66 68 70 72 74
- 65 70 73 75 77 80 83 85 88 90
+ 65 70 73 75 77 80 83 85 88 90
8 9 9 9 9 9 9 9 9 9 9 9 9 10 10 10 10 10 10 10 10 10 10 10 10 11 11 11 11 11
134 135 135 135 135 135 135 136 136 136 136 136 136 137 137 137 137 137 137 138 138 138 138 138 138 139 139 139 139 139
51 52 54 55 56 58 59 60 62 63 64 66 67 68 70 71 72 74 75 76 78 79 80 82 83 84 86 87 88 90
@@ -3135,7 +3135,7 @@ - + @@ -3149,7 +3149,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/00600-00699.xml b/trunk/dist/game/data/stats/skills/00600-00699.xml index 49b5c310c2..873e85dce8 100644 --- a/trunk/dist/game/data/stats/skills/00600-00699.xml +++ b/trunk/dist/game/data/stats/skills/00600-00699.xml @@ -219,7 +219,7 @@ 7.17 19.32 19.32
- 0 0 0.01
+ 1 1 1.01
diff --git a/trunk/dist/game/data/stats/skills/00700-00799.xml b/trunk/dist/game/data/stats/skills/00700-00799.xml index 1f7810d38e..2097549d94 100644 --- a/trunk/dist/game/data/stats/skills/00700-00799.xml +++ b/trunk/dist/game/data/stats/skills/00700-00799.xml @@ -188,7 +188,7 @@ - + @@ -2495,7 +2495,7 @@ 1 2 3 4 5
78 85 90 95 99
- 83 92 98 104 110
+ 83 92 98 104 110
4040 11557 13553 15150 16747
4071 4102 4133 4164 4195 4226 4257 4289 4320 4351 4382 4413 4444 4475 4507
80 78 76 74 72 70 68 66 64 62 59 57 55 53 51
@@ -2523,7 +2523,7 @@ - + @@ -2534,7 +2534,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/00800-00899.xml b/trunk/dist/game/data/stats/skills/00800-00899.xml index 0ff02acb15..4be274c017 100644 --- a/trunk/dist/game/data/stats/skills/00800-00899.xml +++ b/trunk/dist/game/data/stats/skills/00800-00899.xml @@ -1859,7 +1859,8 @@ - + + @@ -1886,7 +1887,8 @@ - + + diff --git a/trunk/dist/game/data/stats/skills/01300-01399.xml b/trunk/dist/game/data/stats/skills/01300-01399.xml index f301800363..abe815e968 100644 --- a/trunk/dist/game/data/stats/skills/01300-01399.xml +++ b/trunk/dist/game/data/stats/skills/01300-01399.xml @@ -1038,7 +1038,7 @@ - + @@ -2167,7 +2167,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/01400-01499.xml b/trunk/dist/game/data/stats/skills/01400-01499.xml index f68919f6dd..8c41d15bab 100644 --- a/trunk/dist/game/data/stats/skills/01400-01499.xml +++ b/trunk/dist/game/data/stats/skills/01400-01499.xml @@ -2788,7 +2788,7 @@ 523 582 624
55 62 68
1.75 1.85 1.95
- 1 2 3
+ 2 3 4
80 92 101
20 23 26
99 97 95 94 92 90 89 87 85 84 82 80 78 77 75 73 72 70 68 67 65 63 62 60 58 57 55 53 52 50
diff --git a/trunk/dist/game/data/stats/skills/01500-01599.xml b/trunk/dist/game/data/stats/skills/01500-01599.xml index 6d5287a567..08a6c9992f 100644 --- a/trunk/dist/game/data/stats/skills/01500-01599.xml +++ b/trunk/dist/game/data/stats/skills/01500-01599.xml @@ -1104,7 +1104,7 @@ - + @@ -1129,7 +1129,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/02500-02599.xml b/trunk/dist/game/data/stats/skills/02500-02599.xml index c8036da17c..8b1cc9e156 100644 --- a/trunk/dist/game/data/stats/skills/02500-02599.xml +++ b/trunk/dist/game/data/stats/skills/02500-02599.xml @@ -192,7 +192,7 @@ - 10633,1,35;0642,1,16;21096,1,2;21101,1,1;10634,1,16;10643,1,10;21097,1,2;21102,1,1;10635,1,11;10644,1,7;21098,1,1.5;21103,1,0.5;21106,1,10636,1,3.5;10645,1,2.1;21099,1,1;21104,1,0.4;21106,1,10637,1,1.5;10646,1,0.9;21100,1,0.3;21105,1,0.299;21593,1,0.001 + 10633,1,35;10642,1,16;21096,1,2;21101,1,1;10634,1,16;10643,1,10;21097,1,2;21102,1,1;10635,1,11;10644,1,7;21098,1,1.5;21103,1,0.5;21106,1,10636,1,3.5;10645,1,2.1;21099,1,1;21104,1,0.4;21106,1,10637,1,1.5;10646,1,0.9;21100,1,0.3;21105,1,0.299;21593,1,0.001
diff --git a/trunk/dist/game/data/stats/skills/04600-04699.xml b/trunk/dist/game/data/stats/skills/04600-04699.xml index e45f52eb6e..cd173b4072 100644 --- a/trunk/dist/game/data/stats/skills/04600-04699.xml +++ b/trunk/dist/game/data/stats/skills/04600-04699.xml @@ -765,7 +765,7 @@ 1 2 3
20 40 60
1.15 1.23 1.3
- 2 3 3
+ 3 4 4
29 53 83
1.8 1.12 1.15
@@ -793,7 +793,7 @@ 20 40 60
1.55 1.65 1.75
1.15 1.23 1.3
- 2 3 3
+ 3 4 4
29 53 83
@@ -882,7 +882,7 @@ 20 40 60
1.1 1.1 1.16
1.21 1.29 1.4
- 2 3 3
+ 3 4 4
0.9 0.9 0.84
29 53 83
1.05 1.05 1.08
@@ -955,7 +955,7 @@ 1 2 3
20 40 60
1.15 1.23 1.3
- 2 3 3
+ 3 4 4
29 53 83
10 15 20
@@ -983,7 +983,7 @@ 20 40 60
1.55 1.65 1.75
1.15 1.23 1.3
- 2 3 3
+ 3 4 4
43 79 124
diff --git a/trunk/dist/game/data/stats/skills/05500-05599.xml b/trunk/dist/game/data/stats/skills/05500-05599.xml index 503d51b59d..ccd2f687c4 100644 --- a/trunk/dist/game/data/stats/skills/05500-05599.xml +++ b/trunk/dist/game/data/stats/skills/05500-05599.xml @@ -408,7 +408,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/06300-06399.xml b/trunk/dist/game/data/stats/skills/06300-06399.xml index 799f7ecd87..1b8118b611 100644 --- a/trunk/dist/game/data/stats/skills/06300-06399.xml +++ b/trunk/dist/game/data/stats/skills/06300-06399.xml @@ -1061,7 +1061,7 @@ 1.05 1.1
icon.skill6366_1 icon.skill6366_2
- 0.02 0.04
+ 1.02 1.04
1.04 1.08
@@ -1083,7 +1083,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/07000-07099.xml b/trunk/dist/game/data/stats/skills/07000-07099.xml index 811ec69edd..58817f8cf1 100644 --- a/trunk/dist/game/data/stats/skills/07000-07099.xml +++ b/trunk/dist/game/data/stats/skills/07000-07099.xml @@ -922,7 +922,7 @@ - + diff --git a/trunk/dist/game/data/stats/skills/21100-21199.xml b/trunk/dist/game/data/stats/skills/21100-21199.xml index fd174699aa..bbfe1db112 100644 --- a/trunk/dist/game/data/stats/skills/21100-21199.xml +++ b/trunk/dist/game/data/stats/skills/21100-21199.xml @@ -1128,6 +1128,7 @@ + diff --git a/trunk/dist/game/data/stats/skills/23200-23299.xml b/trunk/dist/game/data/stats/skills/23200-23299.xml index 5750d04c92..b00f8fa378 100644 --- a/trunk/dist/game/data/stats/skills/23200-23299.xml +++ b/trunk/dist/game/data/stats/skills/23200-23299.xml @@ -1076,7 +1076,7 @@ - + @@ -1113,7 +1113,7 @@ - + @@ -1144,7 +1144,7 @@ - + @@ -1173,7 +1173,7 @@ - + @@ -1200,7 +1200,7 @@ - + diff --git a/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java b/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java index 9a15ccfdf8..987dd563a3 100644 --- a/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java +++ b/trunk/java/com/l2jserver/gameserver/model/PartyMatchRoom.java @@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model; import java.util.ArrayList; import java.util.List; +import com.l2jserver.gameserver.instancemanager.MapRegionManager; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.interfaces.IIdentifiable; import com.l2jserver.gameserver.network.SystemMessageId; @@ -35,7 +36,6 @@ public class PartyMatchRoom implements IIdentifiable private final int _id; private String _title; private int _loot; - private int _location; private int _minlvl; private int _maxlvl; private int _maxmem; @@ -46,7 +46,6 @@ public class PartyMatchRoom implements IIdentifiable _id = id; _title = title; _loot = loot; - _location = 0; // TODO: Closes town _minlvl = minlvl; _maxlvl = maxlvl; _maxmem = maxmem; @@ -132,9 +131,29 @@ public class PartyMatchRoom implements IIdentifiable return _maxlvl; } + /** + *
    + *
  • 1 : Talking Island
    • + *
  • 2 : Gludio
    • + *
  • 3 : Dark Elven Ter.
    • + *
  • 4 : Elven Territory
    • + *
  • 5 : Dion
    • + *
  • 6 : Giran
    • + *
  • 7 : Neutral Zone
    • + *
  • 8 : Lyonn
    • + *
  • 9 : Schuttgart
    • + *
  • 10 : Oren
    • + *
  • 11 : Hunters Village
    • + *
  • 12 : Innadril
    • + *
  • 13 : Aden
    • + *
  • 14 : Rune
    • + *
  • 15 : Goddard
    • + *
+ * @return the id + */ public int getLocation() { - return _location; + return MapRegionManager.getInstance().getMapRegion(_members.get(0)).getBbs(); } public int getMembers() @@ -169,11 +188,6 @@ public class PartyMatchRoom implements IIdentifiable _maxlvl = maxlvl; } - public void setLocation(int loc) - { - _location = loc; - } - public void setLootType(int loot) { _loot = loot; @@ -188,4 +202,4 @@ public class PartyMatchRoom implements IIdentifiable { _title = title; } -} +} \ No newline at end of file diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java index b4bdb6cc4d..0be992d6a5 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java @@ -1954,6 +1954,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (item.isEquipped()) { + if (item.getMana() < item.useSkillDisTime()) + { + abortCast(); + return; + } item.decreaseMana(false, item.useSkillDisTime()); break; } @@ -5173,10 +5178,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Launch weapon Special ability effect if available - L2Weapon activeWeapon = getActiveWeaponItem(); - if (activeWeapon != null) + if (crit) { - activeWeapon.castOnCriticalSkill(this, target); + L2Weapon activeWeapon = getActiveWeaponItem(); + if (activeWeapon != null) + { + activeWeapon.castOnCriticalSkill(this, target); + } } // Recharge any active auto-soulshot tasks for current creature. diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java b/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java index fd56b6aef3..80d3051248 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java @@ -680,20 +680,7 @@ public class CharStat return 1; } - double mpConsume = calcStat(Stats.MP_CONSUME, skill.getMpInitialConsume(), null, skill); - - if (skill.isDance()) - { - return (int) calcStat(Stats.DANCE_MP_CONSUME_RATE, mpConsume); - } - else if (skill.isMagic()) - { - return (int) calcStat(Stats.MAGICAL_MP_CONSUME_RATE, mpConsume); - } - else - { - return (int) calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume); - } + return (int) calcStat(Stats.MP_CONSUME, skill.getMpInitialConsume(), null, skill); } public byte getAttackElement() diff --git a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java index 19257896e2..40df488bac 100644 --- a/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java +++ b/trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java @@ -454,6 +454,7 @@ public abstract class Inventory extends ItemContainer if (itemSkill != null) { + itemSkill.setReferenceItemId(item.getId()); player.addSkill(itemSkill, false); if (itemSkill.isActive()) diff --git a/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java b/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java index 0223a89223..d7dce2113e 100644 --- a/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java +++ b/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java @@ -126,7 +126,7 @@ public final class Skill implements IIdentifiable /** If {@code true} this skill's effect recovery HP/MP or CP from herb. */ private final boolean _isRecoveryHerb; - private final int _refId; + private int _refId; // all times in milliseconds private final int _hitTime; // private final int _skillInterruptTime; @@ -225,7 +225,6 @@ public final class Skill implements IIdentifiable { _id = set.getInt("skill_id"); _level = set.getInt("level"); - _refId = set.getInt("referenceId", 0); _displayId = set.getInt("displayId", _id); _displayLevel = set.getInt("displayLevel", _level); _name = set.getString("name", ""); @@ -1602,6 +1601,11 @@ public final class Skill implements IIdentifiable return _refId; } + public void setReferenceItemId(int val) + { + _refId = val; + } + public String getAttributeName() { return _attribute; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java index 23c786367e..b70e45ce3a 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java @@ -53,7 +53,7 @@ public class ExManagePartyRoomMember extends L2GameServerPacket writeS(_activeChar.getName()); writeD(_activeChar.getActiveClass()); writeD(_activeChar.getLevel()); - writeD(0x00); // TODO: Closes town + writeD(_room.getLocation()); if (_room.getOwner().equals(_activeChar)) { writeD(1); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java index abd41aa2a0..33f7f7bcd1 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -48,7 +48,7 @@ public class ExPartyRoomMember extends L2GameServerPacket writeS(member.getName()); writeD(member.getActiveClass()); writeD(member.getLevel()); - writeD(0x00); // TODO: Closes town + writeD(_room.getLocation()); if (_room.getOwner().equals(member)) { writeD(0x01); diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java index 7fb87705a3..2d605e6e62 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java @@ -41,13 +41,13 @@ public class PartyMatchDetail extends L2GameServerPacket protected final void writeImpl() { writeC(0x9d); - writeD(_room.getId()); // Room ID - writeD(_room.getMaxMembers()); // Max Members - writeD(_room.getMinLvl()); // Level Min - writeD(_room.getMaxLvl()); // Level Max - writeD(_room.getLootType()); // Loot Type - writeD(_room.getLocation()); // Room Location - writeS(_room.getTitle()); // Room title - writeH(0x00); // Unknown + writeD(_room.getId()); + writeD(_room.getMaxMembers()); + writeD(_room.getMinLvl()); + writeD(_room.getMaxLvl()); + writeD(_room.getLootType()); + writeD(_room.getLocation()); + writeS(_room.getTitle()); + writeH(59064); } } diff --git a/trunk/java/com/l2jserver/gameserver/util/MinionList.java b/trunk/java/com/l2jserver/gameserver/util/MinionList.java index 8102ee8a27..2281e066a7 100644 --- a/trunk/java/com/l2jserver/gameserver/util/MinionList.java +++ b/trunk/java/com/l2jserver/gameserver/util/MinionList.java @@ -18,7 +18,6 @@ */ package com.l2jserver.gameserver.util; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; @@ -38,7 +37,7 @@ import com.l2jserver.util.Rnd; */ public class MinionList { - private static Logger _log = Logger.getLogger(MinionList.class.getName()); + private static final Logger _log = Logger.getLogger(MinionList.class.getName()); protected final L2MonsterInstance _master; /** List containing the current spawned minions */ @@ -85,7 +84,8 @@ public class MinionList return; } - int minionCount, minionId, minionsToSpawn; + int minionCount, minionId; + long minionsToSpawn; for (MinionHolder minion : minions) { minionCount = minion.getCount(); @@ -272,22 +272,16 @@ public class MinionList { return; } - // searching in reused minions - if ((_reusedMinionReferences != null) && !_reusedMinionReferences.isEmpty()) + if (_reusedMinionReferences != null) { - L2MonsterInstance minion; - Iterator iter = _reusedMinionReferences.iterator(); - while (iter.hasNext()) + final L2MonsterInstance minion = _reusedMinionReferences.stream().filter(m -> (m.getId() == minionId)).findFirst().orElse(null); + if (minion != null) { - minion = iter.next(); - if ((minion != null) && (minion.getId() == minionId)) - { - iter.remove(); - minion.refreshID(); - initializeNpcInstance(_master, minion); - return; - } + _reusedMinionReferences.remove(minion); + minion.refreshID(); + initializeNpcInstance(_master, minion); + return; } } // not found in cache @@ -397,17 +391,9 @@ public class MinionList // Statistics part - private final int countSpawnedMinionsById(int minionId) + private final long countSpawnedMinionsById(int minionId) { - int count = 0; - for (L2MonsterInstance minion : _minionReferences) - { - if ((minion != null) && (minion.getId() == minionId)) - { - count++; - } - } - return count; + return _minionReferences.stream().filter(npc -> npc.getId() == minionId).count(); } public final int countSpawnedMinions() @@ -417,6 +403,6 @@ public class MinionList public final long lazyCountSpawnedMinionsGroups() { - return _minionReferences.stream().distinct().count(); + return _minionReferences.stream().map(L2MonsterInstance::getId).distinct().count(); } }