From 60e1de0f75948c3d3250d6f38f8dc7ebb59833ae Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 28 Oct 2020 17:50:31 +0000 Subject: [PATCH] Use of testImpl for ItemInstance isAvailable method. --- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- .../model/items/instance/ItemInstance.java | 13 +++++-------- 17 files changed, 85 insertions(+), 136 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 7426c36266..75645c85af 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1774,6 +1774,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1783,18 +1784,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 66bed613d5..f6bdb98976 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1781,6 +1781,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1790,18 +1791,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 66bed613d5..f6bdb98976 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1781,6 +1781,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1790,18 +1791,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 2418bfa500..77dd8f14ba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1781,6 +1781,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1790,18 +1791,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 6e47cf4d44..7f73062125 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1789,6 +1789,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1798,18 +1799,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 6e47cf4d44..7f73062125 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1789,6 +1789,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1798,18 +1799,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 6e47cf4d44..7f73062125 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1789,6 +1789,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1798,18 +1799,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 6e47cf4d44..7f73062125 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1789,6 +1789,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1798,18 +1799,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 6e47cf4d44..7f73062125 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1789,6 +1789,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1798,18 +1799,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index ca2856f8d1..e1f627b0b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1779,6 +1779,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1788,18 +1789,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index ca2856f8d1..e1f627b0b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1779,6 +1779,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1788,18 +1789,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index ca2856f8d1..e1f627b0b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1779,6 +1779,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1788,18 +1789,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index ca2856f8d1..e1f627b0b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1779,6 +1779,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1788,18 +1789,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index ca2856f8d1..e1f627b0b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1779,6 +1779,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1788,18 +1789,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index ca2856f8d1..e1f627b0b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1779,6 +1779,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1788,18 +1789,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 574a393539..adb32afcc5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1761,6 +1761,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1770,18 +1771,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index ca2856f8d1..e1f627b0b9 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1779,6 +1779,7 @@ public class ItemInstance extends WorldObject { return true; } + final Creature owner = getActingPlayer(); if (owner != null) { @@ -1788,18 +1789,14 @@ public class ItemInstance extends WorldObject { continue; } - try - { - if (!condition.test(owner, owner, null, null)) - { - return false; - } - } - catch (Exception e) + + if (!condition.testImpl(owner, owner, null, _item)) { + return false; } } } + return true; }