diff options
| author | rmichela <deltahat@gmail.com> | 2012-03-05 22:33:22 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-08 02:24:28 -0500 |
| commit | 2658dd873f9e7a16d9d27667c419dcf2106a997a (patch) | |
| tree | 3792c5fe070663c79068b8f7f2e9835716ffcb44 /src | |
| parent | 561f73664585ead28f0cacd5dcbb44f91d9c84d4 (diff) | |
| download | bukkit-2658dd873f9e7a16d9d27667c419dcf2106a997a.tar bukkit-2658dd873f9e7a16d9d27667c419dcf2106a997a.tar.gz bukkit-2658dd873f9e7a16d9d27667c419dcf2106a997a.tar.lz bukkit-2658dd873f9e7a16d9d27667c419dcf2106a997a.tar.xz bukkit-2658dd873f9e7a16d9d27667c419dcf2106a997a.zip | |
[Bleeding] Added missing NPE protection to removeMetadata(). Fixes BUKKIT-933
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/metadata/MetadataStoreBase.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java index 0c384abe..a8d948a5 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -82,6 +82,7 @@ public abstract class MetadataStoreBase<T> { public synchronized void removeMetadata(T subject, String metadataKey, Plugin owningPlugin) { String key = cachedDisambiguate(subject, metadataKey); List<MetadataValue> metadataList = metadataMap.get(key); + if (metadataList == null) return; for (int i = 0; i < metadataList.size(); i++) { if (metadataList.get(i).getOwningPlugin().equals(owningPlugin)) { metadataList.remove(i); |