Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-12-25 10:38:19 +01:00
Code Issues Projects Releases Wiki Activity

Verify element type in tag list.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2013-01-07 20:37:21 +01:00
parent 6b3d85af62
commit 38137cea2c
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtList.java
View File

@ -111,27 +111,33 @@ public class NbtList<TType> implements NbtWrapper<List<NbtBase<TType>>>, Iterabl
public List<NbtBase<TType>> getValue() {
if (savedList == null) {
savedList = new ConvertedList<Object, NbtBase<TType>>(container.getValue()) {
// Check and see if the element is valid
private void verifyElement(NbtBase<TType> element) {
if (element == null)
throw new IllegalArgumentException("Cannot store NULL elements in list.");
if (!element.getName().equals(EMPTY_NAME))
throw new IllegalArgumentException("Cannot add a the named NBT tag " + element + " to a list.");
// Check element type
if (size() > 0) {
if (!element.getType().equals(getElementType())) {
throw new IllegalArgumentException(
"Cannot add " + element + " of " + element.getType() + " to a list of type " + getElementType());
}
} else {
container.setSubType(element.getType());
}
}
@Override
public boolean add(NbtBase<TType> e) {
if (e == null)
throw new IllegalArgumentException("Cannot store NULL elements in list.");
if (!e.getName().equals(EMPTY_NAME))
throw new IllegalArgumentException("Cannot add a named NBT tag " + e + " to a list.");
if (size() == 0)
container.setSubType(e.getType());
verifyElement(e);
return super.add(e);
}
@Override
public void add(int index, NbtBase<TType> element) {
if (element == null)
throw new IllegalArgumentException("Cannot store NULL elements in list.");
if (!element.getName().equals(EMPTY_NAME))
throw new IllegalArgumentException("Cannot add a the named NBT tag " + element + " to a list.");
if (index == 0)
container.setSubType(element.getType());
verifyElement(element);
super.add(index, element);
}