summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorWesley Wolfe <wesley.d.wolfe+git@gmail.com>2014-07-01 00:47:39 -0500
committerWesley Wolfe <wesley.d.wolfe+git@gmail.com>2014-07-01 00:48:07 -0500
commita8628fd645e12ec22bc525f49dd25f68d094f3ef (patch)
tree1a6d60efe731505ec910f2db397979c535460f35 /src/main/java
parentb602b5efa443a6d302136ff8fa69f64fd8f68373 (diff)
downloadcraftbukkit-a8628fd645e12ec22bc525f49dd25f68d094f3ef.tar
craftbukkit-a8628fd645e12ec22bc525f49dd25f68d094f3ef.tar.gz
craftbukkit-a8628fd645e12ec22bc525f49dd25f68d094f3ef.tar.lz
craftbukkit-a8628fd645e12ec22bc525f49dd25f68d094f3ef.tar.xz
craftbukkit-a8628fd645e12ec22bc525f49dd25f68d094f3ef.zip
Use 4787c23dce0f5ac856d8d398225828971a93a3ff Guava patch for onlinePlayers
This change improves the quality of life for plugin developers using iterator iteration with side-effects. In the specified Guava patch, the internal iterator no longer relies on the AbstractList iterator which iterates by index, and will instead wrap the provided iterator in a transformer given the Function.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3c92c3ce..883f8099 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -186,9 +186,7 @@ import com.avaje.ebean.config.DataSourceConfig;
import com.avaje.ebean.config.ServerConfig;
import com.avaje.ebean.config.dbplatform.SQLitePlatform;
import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation;
-import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
import com.google.common.collect.MapMaker;
import jline.console.ConsoleReader;
@@ -246,7 +244,7 @@ public final class CraftServer implements Server {
public CraftServer(MinecraftServer console, PlayerList playerList) {
this.console = console;
this.playerList = (DedicatedPlayerList) playerList;
- this.playerView = Collections.unmodifiableList(Lists.transform(playerList.players, new Function<EntityPlayer, CraftPlayer>() {
+ this.playerView = Collections.unmodifiableList(net.minecraft.util.com.google.common.collect.Lists.transform(playerList.players, new net.minecraft.util.com.google.common.base.Function<EntityPlayer, CraftPlayer>() {
@Override
public CraftPlayer apply(EntityPlayer player) {
return player.getBukkitEntity();