From 856f603e533844f38e3b1255d109ba5a96b75da6 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Mon, 21 Dec 2020 03:28:16 -0300
Subject: [PATCH] Minor toArray() cleanup
Read https://shipilev.net/blog/2016/arrays-wisdom-ancients/ if you are
in for some arcane magic.
---
.../com/l2jserver/datapack/handlers/targethandlers/Area.java | 2 +-
.../datapack/handlers/targethandlers/AreaCorpseMob.java | 2 +-
.../datapack/handlers/targethandlers/AreaFriendly.java | 2 +-
.../datapack/handlers/targethandlers/AreaSummon.java | 2 +-
.../com/l2jserver/datapack/handlers/targethandlers/Aura.java | 2 +-
.../datapack/handlers/targethandlers/AuraCorpseMob.java | 2 +-
.../datapack/handlers/targethandlers/AuraFriendly.java | 2 +-
.../datapack/handlers/targethandlers/AuraUndeadEnemy.java | 2 +-
.../datapack/handlers/targethandlers/BehindArea.java | 2 +-
.../datapack/handlers/targethandlers/BehindAura.java | 2 +-
.../com/l2jserver/datapack/handlers/targethandlers/Clan.java | 2 +-
.../datapack/handlers/targethandlers/ClanMember.java | 2 +-
.../datapack/handlers/targethandlers/CommandChannel.java | 4 ++--
.../l2jserver/datapack/handlers/targethandlers/FrontArea.java | 2 +-
.../l2jserver/datapack/handlers/targethandlers/FrontAura.java | 2 +-
.../l2jserver/datapack/handlers/targethandlers/Ground.java | 2 +-
.../com/l2jserver/datapack/handlers/targethandlers/Party.java | 2 +-
.../l2jserver/datapack/handlers/targethandlers/PartyClan.java | 4 ++--
.../datapack/handlers/targethandlers/PartyNotMe.java | 2 +-
.../datapack/handlers/targethandlers/TargetParty.java | 2 +-
20 files changed, 22 insertions(+), 22 deletions(-)
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 765be1aa3d..72021dbf38 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 0a7bfd0b7b..16e0b6b8b0 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 a1b0e2d68f..441cb90c5d 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 f3b0456754..9d13c17e5b 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 fc13d2964c..9adc9b330f 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 cdf39251c7..b21de4802b 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 63ce1e4d79..ae4786ce27 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 05f0218caa..200a91b6fa 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 baca64303d..52f5504386 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 aa23731a0d..e5cad3e215 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 e7d462b69c..26936d3cb5 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 f3df35eca9..65417d9053 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 66a25e6969..0a9a312e08 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 61faf9ee03..1f936a7c87 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 ecb1b213fa..e436cdc64a 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 656edfb330..3ec77e1c8c 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 1eadf2361b..b684dd4d3a 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 d689f951a8..658b5aa819 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 426d3be416..72b94808a0 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 91ea7c6fa7..aa044009f0 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
--
GitLab