diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2010-12-26 02:20:29 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2010-12-26 02:20:29 +0000 |
commit | 01a0562cabb4bc43e30942c9017355171cb69ca2 (patch) | |
tree | 02e39776e8f4a3de4f6c4bfe69635f1c81289148 /src/org | |
parent | 2798e5b84fa5bd24860bf23669216ab23c58af9e (diff) | |
download | craftbukkit-01a0562cabb4bc43e30942c9017355171cb69ca2.tar craftbukkit-01a0562cabb4bc43e30942c9017355171cb69ca2.tar.gz craftbukkit-01a0562cabb4bc43e30942c9017355171cb69ca2.tar.lz craftbukkit-01a0562cabb4bc43e30942c9017355171cb69ca2.tar.xz craftbukkit-01a0562cabb4bc43e30942c9017355171cb69ca2.zip |
Call hooks, update to new code
Diffstat (limited to 'src/org')
-rw-r--r-- | src/org/bukkit/craftbukkit/CraftPlayer.java | 6 | ||||
-rw-r--r-- | src/org/bukkit/craftbukkit/CraftServer.java | 16 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/org/bukkit/craftbukkit/CraftPlayer.java b/src/org/bukkit/craftbukkit/CraftPlayer.java index 0b86306d..643dea16 100644 --- a/src/org/bukkit/craftbukkit/CraftPlayer.java +++ b/src/org/bukkit/craftbukkit/CraftPlayer.java @@ -1,15 +1,15 @@ package org.bukkit.craftbukkit; -import net.minecraft.server.fi; +import net.minecraft.server.EntityPlayerMP; import org.bukkit.Player; public class CraftPlayer implements Player { - private fi player; + private EntityPlayerMP player; private final String name; private final CraftServer server; - public CraftPlayer(CraftServer serv, fi handle) { + public CraftPlayer(CraftServer serv, EntityPlayerMP handle) { player = handle; name = player.aw; server = serv; diff --git a/src/org/bukkit/craftbukkit/CraftServer.java b/src/org/bukkit/craftbukkit/CraftServer.java index 770a39d5..c6aaec7e 100644 --- a/src/org/bukkit/craftbukkit/CraftServer.java +++ b/src/org/bukkit/craftbukkit/CraftServer.java @@ -8,6 +8,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.*; import net.minecraft.server.*; +import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; import org.bukkit.plugin.java.JavaPluginLoader; @@ -19,7 +20,7 @@ public final class CraftServer implements Server { private final PluginManager pluginManager = new SimplePluginManager(this); protected final MinecraftServer console; - protected final hl server; + protected final ServerConfigurationManager server; public CraftServer(MinecraftServer instance, String ver) { serverVersion = ver; @@ -50,7 +51,7 @@ public final class CraftServer implements Server { } public Player[] getOnlinePlayers() { - List<fi> online = server.b; + List<EntityPlayerMP> online = server.b; Player[] players = new Player[online.size()]; for (int i = 0; i < players.length; i++) { @@ -67,6 +68,17 @@ public final class CraftServer implements Server { return players; } + public Player getPlayer(EntityPlayerMP entity) { + Player result = playerCache.get(entity.aw); + + if (result == null) { + result = new CraftPlayer(this, entity); + playerCache.put(entity.aw, result); + } + + return result; + } + public PluginManager getPluginManager() { return pluginManager; } |