OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Call hooks, update to new code

Browse source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot 2010-12-26 02:20:29 +00:00
parent e44cf75ad1
commit 4f56472cfd
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
paper-server/src/org/bukkit/craftbukkit/CraftPlayer.java
View file

@ -1,15 +1,15 @@
package org.bukkit.craftbukkit; package org.bukkit.craftbukkit;
import net.minecraft.server.fi; import net.minecraft.server.EntityPlayerMP;
import org.bukkit.Player; import org.bukkit.Player;
public class CraftPlayer implements Player { public class CraftPlayer implements Player {
private fi player; private EntityPlayerMP player;
private final String name; private final String name;
private final CraftServer server; private final CraftServer server;
public CraftPlayer(CraftServer serv, fi handle) { public CraftPlayer(CraftServer serv, EntityPlayerMP handle) {
player = handle; player = handle;
name = player.aw; name = player.aw;
server = serv; server = serv;

16
paper-server/src/org/bukkit/craftbukkit/CraftServer.java
View file

@ -8,6 +8,7 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.*; import org.bukkit.*;
import net.minecraft.server.*; import net.minecraft.server.*;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.SimplePluginManager; import org.bukkit.plugin.SimplePluginManager;
import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.plugin.java.JavaPluginLoader;
@ -19,7 +20,7 @@ public final class CraftServer implements Server {
private final PluginManager pluginManager = new SimplePluginManager(this); private final PluginManager pluginManager = new SimplePluginManager(this);
protected final MinecraftServer console; protected final MinecraftServer console;
protected final hl server; protected final ServerConfigurationManager server;
public CraftServer(MinecraftServer instance, String ver) { public CraftServer(MinecraftServer instance, String ver) {
serverVersion = ver; serverVersion = ver;
@ -50,7 +51,7 @@ public final class CraftServer implements Server {
} }
public Player[] getOnlinePlayers() { public Player[] getOnlinePlayers() {
List<fi> online = server.b; List<EntityPlayerMP> online = server.b;
Player[] players = new Player[online.size()]; Player[] players = new Player[online.size()];
for (int i = 0; i < players.length; i++) { for (int i = 0; i < players.length; i++) {
@ -67,6 +68,17 @@ public final class CraftServer implements Server {
return players; 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() { public PluginManager getPluginManager() {
return pluginManager; return pluginManager;
} }