Enable items on pet inventory.

This commit is contained in:
MobiusDevelopment
2019-03-17 01:09:32 +00:00
parent 0236115b50
commit fa7142dee2
11 changed files with 209 additions and 132 deletions

View File

@@ -1773,22 +1773,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1790,22 +1790,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;

View File

@@ -1788,22 +1788,29 @@ public final class L2ItemInstance extends L2Object
{ {
return true; return true;
} }
final L2PcInstance owner = getActingPlayer(); if ((_loc == ItemLocation.PET) || (_loc == ItemLocation.PET_EQUIP))
for (Condition condition : _item.getConditions())
{ {
if (condition == null) return true;
}
L2Character owner = getActingPlayer();
if (owner != null)
{
for (Condition condition : _item.getConditions())
{ {
continue; if (condition == null)
} {
try continue;
{ }
if (!condition.test(owner, owner, null, null)) try
{
if (!condition.test(owner, owner, null, null))
{
return false;
}
}
catch (Exception e)
{ {
return false;
} }
}
catch (Exception e)
{
} }
} }
return true; return true;