Removed stream usage from Item.

This commit is contained in:
MobiusDevelopment 2023-01-08 12:44:51 +00:00
parent cea3823382
commit cb79b5f792
26 changed files with 156 additions and 78 deletions

View File

@ -1198,11 +1198,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1203,11 +1203,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1203,11 +1203,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1203,11 +1203,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1264,11 +1264,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1264,11 +1264,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1264,11 +1264,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1264,11 +1264,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1264,11 +1264,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1264,11 +1264,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1263,11 +1263,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1264,11 +1264,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1198,11 +1198,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1198,11 +1198,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1203,11 +1203,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1203,11 +1203,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1255,11 +1255,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1255,11 +1255,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1255,11 +1255,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1255,11 +1255,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1255,11 +1255,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1196,11 +1196,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1258,11 +1258,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1258,11 +1258,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1259,11 +1259,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;

View File

@ -1259,11 +1259,14 @@ public class Item extends WorldObject
{
if (_itemTemplate.getAttributes() != null)
{
return _itemTemplate.getAttributes().stream().findFirst().orElse(null);
if (!_itemTemplate.getAttributes().isEmpty())
{
return _itemTemplate.getAttributes().iterator().next();
}
}
else if (_elementals != null)
else if ((_elementals != null) && !_elementals.isEmpty())
{
return _elementals.values().stream().findFirst().orElse(null);
return _elementals.values().iterator().next();
}
}
return null;