[Bleeding] Added missing NPE protection to removeMetadata(). Fixes BUKKIT-933

This commit is contained in:
rmichela 2012-03-05 22:33:22 -05:00 committed by EvilSeph
parent 561f736645
commit 2658dd873f

View File

@ -82,6 +82,7 @@ public abstract class MetadataStoreBase<T> {
public synchronized void removeMetadata(T subject, String metadataKey, Plugin owningPlugin) { public synchronized void removeMetadata(T subject, String metadataKey, Plugin owningPlugin) {
String key = cachedDisambiguate(subject, metadataKey); String key = cachedDisambiguate(subject, metadataKey);
List<MetadataValue> metadataList = metadataMap.get(key); List<MetadataValue> metadataList = metadataMap.get(key);
if (metadataList == null) return;
for (int i = 0; i < metadataList.size(); i++) { for (int i = 0; i < metadataList.size(); i++) {
if (metadataList.get(i).getOwningPlugin().equals(owningPlugin)) { if (metadataList.get(i).getOwningPlugin().equals(owningPlugin)) {
metadataList.remove(i); metadataList.remove(i);