summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-09-17 22:37:45 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-09-17 22:38:55 +0100
commit3d04c67ae4ea3dbf05449c951e741beac8388beb (patch)
tree6e9e0fbc9cc4141d12c4d35a001ae387c9280b3d /src/main
parent56f9c092beb6e70e732b2d872771f6d97dddbffc (diff)
downloadbukkit-3d04c67ae4ea3dbf05449c951e741beac8388beb.tar
bukkit-3d04c67ae4ea3dbf05449c951e741beac8388beb.tar.gz
bukkit-3d04c67ae4ea3dbf05449c951e741beac8388beb.tar.lz
bukkit-3d04c67ae4ea3dbf05449c951e741beac8388beb.tar.xz
bukkit-3d04c67ae4ea3dbf05449c951e741beac8388beb.zip
Switched to native weak hashmap instead of guavas for SimplePluginManager
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/plugin/SimplePluginManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 0e611cc3..204f08f1 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -1,7 +1,6 @@
package org.bukkit.plugin;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.MapMaker;
import java.io.File;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -18,6 +17,7 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.regex.Matcher;
import org.bukkit.Server;
@@ -472,7 +472,7 @@ public final class SimplePluginManager implements PluginManager {
Map<Permissible, Boolean> map = permSubs.get(name);
if (map == null) {
- map = new MapMaker().weakKeys().makeMap();
+ map = new WeakHashMap<Permissible, Boolean>();
permSubs.put(name, map);
}
@@ -507,7 +507,7 @@ public final class SimplePluginManager implements PluginManager {
Map<Permissible, Boolean> map = defSubs.get(op);
if (map == null) {
- map = new MapMaker().weakKeys().makeMap();
+ map = new WeakHashMap<Permissible, Boolean>();
defSubs.put(op, map);
}