Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bleeding] Removing the last metadata item for a key now sets hasMetadata(key) to false. Addresses BUKKIT-1380

Browse Source
This commit is contained in:
rmichela 2012-03-28 01:41:33 -04:00 committed by EvilSeph
parent e9064329e6
commit 1dc7eadf80
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/metadata/MetadataStoreBase.java
View File

@ -86,6 +86,9 @@ public abstract class MetadataStoreBase<T> {
for (int i = 0; i < metadataList.size(); i++) {
if (metadataList.get(i).getOwningPlugin().equals(owningPlugin)) {
metadataList.remove(i);
if (metadataList.isEmpty()) {
metadataMap.remove(key);
}
}
}
}

9
src/test/java/org/bukkit/metadata/MetadataStoreTest.java
View File

@ -96,6 +96,15 @@ public class MetadataStoreTest {
assertEquals(20, subject.getMetadata("subject", "key").get(0).value());
}
@Test
public void testMetadataRemoveLast() {
subject.setMetadata("subject", "key", new FixedMetadataValue(pluginX, 10));
subject.removeMetadata("subject", "key", pluginX);
assertFalse(subject.hasMetadata("subject", "key"));
assertEquals(0, subject.getMetadata("subject", "key").size());
}
@Test
public void testMetadataRemoveForNonExistingPlugin() {
subject.setMetadata("subject", "key", new FixedMetadataValue(pluginX, 10));