Length check for armor set getters.

This commit is contained in:
MobiusDevelopment
2020-08-03 14:09:21 +00:00
parent 4d9f34b5ba
commit 917c02c7da
19 changed files with 99 additions and 23 deletions

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -178,7 +178,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -178,7 +178,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -178,7 +178,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -93,12 +93,16 @@ public class ArmorSetData implements IXmlReader
public boolean setExists(int chestId) public boolean setExists(int chestId)
{ {
return _armorSets[chestId] != null; return (_armorSets.length >= chestId) && (_armorSets[chestId] != null);
} }
public ArmorSet getSet(int chestId) public ArmorSet getSet(int chestId)
{ {
return _armorSets[chestId]; if (_armorSets.length >= chestId)
{
return _armorSets[chestId];
}
return null;
} }
public static ArmorSetData getInstance() public static ArmorSetData getInstance()

View File

@@ -93,12 +93,16 @@ public class ArmorSetData implements IXmlReader
public boolean setExists(int chestId) public boolean setExists(int chestId)
{ {
return _armorSets[chestId] != null; return (_armorSets.length >= chestId) && (_armorSets[chestId] != null);
} }
public ArmorSet getSet(int chestId) public ArmorSet getSet(int chestId)
{ {
return _armorSets[chestId]; if (_armorSets.length >= chestId)
{
return _armorSets[chestId];
}
return null;
} }
public static ArmorSetData getInstance() public static ArmorSetData getInstance()

View File

@@ -176,7 +176,7 @@ public class ArmorSetData implements IXmlReader
*/ */
public boolean isArmorSet(int chestId) public boolean isArmorSet(int chestId)
{ {
return _armorSets[chestId] != null; return (_armorSets.length >= chestId) && (_armorSets[chestId] != null);
} }
/** /**
@@ -186,7 +186,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int chestId) public ArmorSet getSet(int chestId)
{ {
return _armorSets[chestId]; if (_armorSets.length >= chestId)
{
return _armorSets[chestId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,7 @@ public class ArmorSetData implements IXmlReader
*/ */
public boolean isArmorSet(int chestId) public boolean isArmorSet(int chestId)
{ {
return _armorSets[chestId] != null; return (_armorSets.length >= chestId) && (_armorSets[chestId] != null);
} }
/** /**
@@ -186,7 +186,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int chestId) public ArmorSet getSet(int chestId)
{ {
return _armorSets[chestId]; if (_armorSets.length >= chestId)
{
return _armorSets[chestId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -178,7 +178,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -178,7 +178,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -178,7 +178,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**

View File

@@ -176,7 +176,11 @@ public class ArmorSetData implements IXmlReader
*/ */
public ArmorSet getSet(int setId) public ArmorSet getSet(int setId)
{ {
return _armorSets[setId]; if (_armorSets.length >= setId)
{
return _armorSets[setId];
}
return null;
} }
/** /**