diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java
index 765be1aa3de447d0f84d23f06d96b06279e77832..72021dbf38f8f1c77c3480bbdd8ab5ea8ee02a83 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Area.java
@@ -91,7 +91,7 @@ public class Area implements ITargetTypeHandler {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java
index 0a7bfd0b7b3fae23b34c7238035c8bd17b60e8cf..16e0b6b8b015f266de24d93088414e2ec5d9f078 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaCorpseMob.java
@@ -68,7 +68,7 @@ public class AreaCorpseMob implements ITargetTypeHandler {
if (targetList.isEmpty()) {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java
index a1b0e2d68ff17f9d41d615ecf5010526ece7b7aa..441cb90c5d60bfbc69d43f9577e8e53a6bb8ecaa 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaFriendly.java
@@ -87,7 +87,7 @@ public class AreaFriendly implements ITargetTypeHandler {
if (targetList.isEmpty()) {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
private boolean checkTarget(L2PcInstance activeChar, L2Character target) {
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java
index f3b0456754b5551c8c0868618e18a846e84553e0..9d13c17e5b5459b4f0890d5f085e439ed49d1aa3 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AreaSummon.java
@@ -80,7 +80,7 @@ public class AreaSummon implements ITargetTypeHandler {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java
index fc13d2964c79271c64e0755712bb15ac7f3a25e0..9adc9b330f2275915d3814a3e4236695f3e0974d 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Aura.java
@@ -65,7 +65,7 @@ public class Aura implements ITargetTypeHandler {
targetList.add(obj);
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java
index cdf39251c725ee7aeec7a29839b21f4b7e47d825..b21de4802bf6232911964d5040df6f98e8718510 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraCorpseMob.java
@@ -53,7 +53,7 @@ public class AuraCorpseMob implements ITargetTypeHandler {
targetList.add(obj);
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java
index 63ce1e4d7996df0a65209554969b428f965e9963..ae4786ce27bc871e6a9634ef2897af8204391263 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraFriendly.java
@@ -57,7 +57,7 @@ public class AuraFriendly implements ITargetTypeHandler {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
private boolean checkTarget(L2PcInstance activeChar, L2Character target) {
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java
index 05f0218caac0b377b532acb84e833aa1ee84fa5e..200a91b6fa140211ce888ac538fe7c7544993664 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/AuraUndeadEnemy.java
@@ -52,7 +52,7 @@ public class AuraUndeadEnemy implements ITargetTypeHandler {
targetList.add(obj);
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java
index baca64303d4df6d511ecca993df316ce47699c37..52f5504386819d2b7a81f6efb8307352a3e8652f 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindArea.java
@@ -95,7 +95,7 @@ public class BehindArea implements ITargetTypeHandler {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java
index aa23731a0dc8161a980b5d04fd7448744fdbaa61..e5cad3e215b4e6214f752c21a1b6970fd12724af 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/BehindAura.java
@@ -63,7 +63,7 @@ public class BehindAura implements ITargetTypeHandler {
targetList.add(obj);
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java
index e7d462b69cda70a56507441e88f6a7934e14f2c7..26936d3cb59de87beed2f8e216ee3a59cdd32208 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Clan.java
@@ -142,7 +142,7 @@ public class Clan implements ITargetTypeHandler {
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java
index f3df35eca993da7baec697c0eb6ad70364666352..65417d9053af85a369dc1baba6318186745862eb 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/ClanMember.java
@@ -64,7 +64,7 @@ public class ClanMember implements ITargetTypeHandler {
} else {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java
index 66a25e6969b573d0ccd05756f531898557869c40..0a9a312e082a8876defba1f184cab8f85f70db0e 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/CommandChannel.java
@@ -53,7 +53,7 @@ public class CommandChannel implements ITargetTypeHandler {
// if player in not in party
if (party == null) {
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
// Get all visible objects in a spherical area near the L2Character
@@ -73,7 +73,7 @@ public class CommandChannel implements ITargetTypeHandler {
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java
index 61faf9ee033ca904c87531bd43a713a5a3d28212..1f936a7c8716f83d2123b516e35175d28bbb72df 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontArea.java
@@ -95,7 +95,7 @@ public class FrontArea implements ITargetTypeHandler {
return EMPTY_TARGET_LIST;
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java
index ecb1b213faf3474d87f4f3cc22e2454b434dcba1..e436cdc64aad98f01064699401bbde4f146fe472 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/FrontAura.java
@@ -63,7 +63,7 @@ public class FrontAura implements ITargetTypeHandler {
targetList.add(obj);
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java
index 656edfb330d9b5aaf6fdbb3b5b70fb19988bb54a..3ec77e1c8c3238c21aa6e39816846664a6fee32a 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Ground.java
@@ -63,7 +63,7 @@ public class Ground implements ITargetTypeHandler {
targetList.add(activeChar);
}
}
- return targetList.isEmpty() ? EMPTY_TARGET_LIST : targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java
index 1eadf2361b1982e5349974ec1094a92c0318c965..b684dd4d3aa7b79c1c993b74e2772549a2ff112d 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Party.java
@@ -71,7 +71,7 @@ public class Party implements ITargetTypeHandler {
}
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java
index d689f951a8fe14e413ca2c485e9215f99464b0a1..658b5aa819678d26aa180a51bf5cee2334fde5f4 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyClan.java
@@ -61,7 +61,7 @@ public class PartyClan implements ITargetTypeHandler {
// if player in clan and not in party
if (!(hasClan || hasParty)) {
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
// Get all visible objects in a spherical area near the L2Character
@@ -129,7 +129,7 @@ public class PartyClan implements ITargetTypeHandler {
targetList.add(obj);
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java
index 426d3be41622bb811ab1b17f2d9a5d2b1d5b7bc8..72b94808a0332086db8a0c66f412493e3a1e531c 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/PartyNotMe.java
@@ -58,7 +58,7 @@ public class PartyNotMe implements ITargetTypeHandler {
}
}
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java
index 91ea7c6fa7308b45defa51beab52043d0389ade0..aa044009f01346de6301bb596e5b0f565a9cb953 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/TargetParty.java
@@ -63,7 +63,7 @@ public class TargetParty implements ITargetTypeHandler {
} else {
targetList.add(target);
}
- return targetList.toArray(new L2Character[targetList.size()]);
+ return targetList.toArray(EMPTY_TARGET_LIST);
}
@Override