2010-12-26 03:20:29 +01:00
|
|
|
package net.minecraft.server;
|
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
import java.io.BufferedReader;
|
|
|
|
import java.io.File;
|
|
|
|
import java.io.FileReader;
|
|
|
|
import java.io.FileWriter;
|
|
|
|
import java.io.PrintWriter;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.HashSet;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Set;
|
2010-12-26 03:20:29 +01:00
|
|
|
import java.util.logging.Logger;
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-11 09:25:13 +01:00
|
|
|
// CraftBukkit start
|
2011-02-04 16:04:28 +01:00
|
|
|
import org.bukkit.Location;
|
2010-12-26 03:20:29 +01:00
|
|
|
import org.bukkit.craftbukkit.CraftServer;
|
2011-02-22 19:02:06 +01:00
|
|
|
import org.bukkit.craftbukkit.CraftWorld;
|
2011-02-25 17:12:38 +01:00
|
|
|
import org.bukkit.craftbukkit.command.ColouredConsoleSender;
|
2011-01-23 13:23:13 +01:00
|
|
|
import org.bukkit.entity.Player;
|
2011-03-27 00:34:33 +01:00
|
|
|
import org.bukkit.event.player.PlayerQuitEvent;
|
2011-03-26 12:31:48 +01:00
|
|
|
import org.bukkit.event.player.PlayerJoinEvent;
|
2010-12-28 23:22:26 +01:00
|
|
|
import org.bukkit.event.player.PlayerLoginEvent;
|
2011-02-04 16:04:28 +01:00
|
|
|
import org.bukkit.event.player.PlayerRespawnEvent;
|
2011-01-11 09:25:13 +01:00
|
|
|
// CraftBukkit end
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2010-12-26 03:20:29 +01:00
|
|
|
public class ServerConfigurationManager {
|
|
|
|
|
|
|
|
public static Logger a = Logger.getLogger("Minecraft");
|
2011-04-20 19:05:14 +02:00
|
|
|
public List players = new ArrayList();
|
2011-05-14 16:29:42 +02:00
|
|
|
public MinecraftServer server; // CraftBukkit - private -> public
|
2011-05-26 23:15:27 +02:00
|
|
|
// private PlayerManager[] d = new PlayerManager[2]; // Craftbukkit - removed
|
2011-05-14 16:29:42 +02:00
|
|
|
public int maxPlayers; // CraftBukkit - private -> public
|
2011-04-20 19:05:14 +02:00
|
|
|
private Set banByName = new HashSet();
|
|
|
|
private Set banByIP = new HashSet();
|
2011-01-29 22:50:29 +01:00
|
|
|
private Set h = new HashSet();
|
2011-02-23 03:37:56 +01:00
|
|
|
private Set i = new HashSet();
|
2010-12-26 03:20:29 +01:00
|
|
|
private File j;
|
|
|
|
private File k;
|
2011-02-23 03:37:56 +01:00
|
|
|
private File l;
|
|
|
|
private File m;
|
2011-05-14 16:29:42 +02:00
|
|
|
public PlayerFileData playerFileData; // CraftBukkit - private - >public
|
2011-02-23 03:37:56 +01:00
|
|
|
private boolean o;
|
2010-12-26 03:20:29 +01:00
|
|
|
|
2011-02-04 16:04:28 +01:00
|
|
|
// CraftBukkit start
|
2011-04-20 19:05:14 +02:00
|
|
|
private CraftServer cserver;
|
2011-02-04 16:04:28 +01:00
|
|
|
|
2011-01-11 09:25:13 +01:00
|
|
|
public ServerConfigurationManager(MinecraftServer minecraftserver) {
|
2011-01-30 13:51:20 +01:00
|
|
|
minecraftserver.server = new CraftServer(minecraftserver, this);
|
2011-02-25 17:12:38 +01:00
|
|
|
minecraftserver.console = new ColouredConsoleSender(minecraftserver.server);
|
2011-04-20 19:05:14 +02:00
|
|
|
cserver = minecraftserver.server;
|
2011-02-04 16:04:28 +01:00
|
|
|
// CraftBukkit end
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
this.server = minecraftserver;
|
2011-02-23 03:37:56 +01:00
|
|
|
this.j = minecraftserver.a("banned-players.txt");
|
|
|
|
this.k = minecraftserver.a("banned-ips.txt");
|
|
|
|
this.l = minecraftserver.a("ops.txt");
|
|
|
|
this.m = minecraftserver.a("white-list.txt");
|
2011-05-26 14:48:22 +02:00
|
|
|
int i = minecraftserver.propertyManager.getInt("view-distance", 10);
|
|
|
|
|
2011-05-26 23:15:27 +02:00
|
|
|
// Craftbukkit - removed playermanagers
|
2011-04-20 19:05:14 +02:00
|
|
|
this.maxPlayers = minecraftserver.propertyManager.getInt("max-players", 20);
|
|
|
|
this.o = minecraftserver.propertyManager.getBoolean("white-list", false);
|
2011-01-29 22:50:29 +01:00
|
|
|
this.g();
|
|
|
|
this.i();
|
2011-02-23 03:37:56 +01:00
|
|
|
this.k();
|
|
|
|
this.m();
|
2011-01-29 22:50:29 +01:00
|
|
|
this.h();
|
|
|
|
this.j();
|
2011-02-23 03:37:56 +01:00
|
|
|
this.l();
|
|
|
|
this.n();
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
public void setPlayerFileData(WorldServer[] aworldserver) {
|
2011-04-20 19:05:14 +02:00
|
|
|
if (this.playerFileData != null) return; // CraftBukkit
|
2011-05-26 14:48:22 +02:00
|
|
|
this.playerFileData = aworldserver[0].p().d();
|
|
|
|
}
|
|
|
|
|
|
|
|
public void a(EntityPlayer entityplayer) {
|
2011-05-26 23:15:27 +02:00
|
|
|
// Craftbukkit - removed playermanagers
|
2011-05-28 22:50:08 +02:00
|
|
|
for(WorldServer world : this.server.worlds) {
|
|
|
|
if(world.manager.a.contains(entityplayer)) {
|
|
|
|
world.manager.removePlayer(entityplayer);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-05-26 14:48:22 +02:00
|
|
|
this.a(entityplayer.dimension).addPlayer(entityplayer);
|
|
|
|
WorldServer worldserver = this.server.a(entityplayer.dimension);
|
|
|
|
|
|
|
|
worldserver.chunkProviderServer.getChunkAt((int) entityplayer.locX >> 4, (int) entityplayer.locZ >> 4);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public int a() {
|
2011-05-26 23:15:27 +02:00
|
|
|
// Craftbukkit start
|
|
|
|
if (this.server.worlds.size() == 0) {
|
|
|
|
return this.server.propertyManager.getInt("view-distance", 10) * 16 - 16;
|
|
|
|
} else {
|
|
|
|
return this.server.worlds.get(0).manager.c();
|
|
|
|
}
|
|
|
|
// Craftbukkit end
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
private PlayerManager a(int i) {
|
2011-05-26 23:15:27 +02:00
|
|
|
return server.a(i).manager; // Craftbukkit
|
2011-05-26 14:48:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void b(EntityPlayer entityplayer) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.playerFileData.b(entityplayer);
|
2011-05-26 14:48:22 +02:00
|
|
|
}
|
2011-02-05 19:15:04 +01:00
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
public void c(EntityPlayer entityplayer) {
|
|
|
|
this.players.add(entityplayer);
|
|
|
|
WorldServer worldserver = this.server.a(entityplayer.dimension);
|
|
|
|
|
|
|
|
worldserver.chunkProviderServer.getChunkAt((int) entityplayer.locX >> 4, (int) entityplayer.locZ >> 4);
|
|
|
|
|
|
|
|
while (worldserver.getEntities(entityplayer, entityplayer.boundingBox).size() != 0) {
|
2011-04-20 19:05:14 +02:00
|
|
|
entityplayer.setPosition(entityplayer.locX, entityplayer.locY + 1.0D, entityplayer.locZ);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
// CraftBukkit start
|
2011-04-20 19:05:14 +02:00
|
|
|
PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.name + " joined the game.");
|
|
|
|
cserver.getPluginManager().callEvent(playerJoinEvent);
|
2011-03-26 12:31:48 +01:00
|
|
|
|
|
|
|
String joinMessage = playerJoinEvent.getJoinMessage();
|
|
|
|
|
|
|
|
if (joinMessage != null) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.server.serverConfigurationManager.sendAll(new Packet3Chat(joinMessage));
|
2011-03-26 12:31:48 +01:00
|
|
|
}
|
2011-02-23 13:56:36 +01:00
|
|
|
// CraftBukkit end
|
2011-05-26 14:48:22 +02:00
|
|
|
|
|
|
|
worldserver.addEntity(entityplayer);
|
|
|
|
this.a(entityplayer.dimension).addPlayer(entityplayer);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
public void d(EntityPlayer entityplayer) {
|
|
|
|
this.a(entityplayer.dimension).movePlayer(entityplayer);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
public String disconnect(EntityPlayer entityplayer) { // CraftBukkit - changed return type
|
2011-01-29 22:50:29 +01:00
|
|
|
// CraftBukkit start
|
2011-04-03 19:02:35 +02:00
|
|
|
// Quitting must be before we do final save of data, in case plugins need to modify it
|
2011-05-26 14:48:22 +02:00
|
|
|
this.a(entityplayer.dimension).removePlayer(entityplayer);
|
2011-04-20 19:05:14 +02:00
|
|
|
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.name + " left the game.");
|
|
|
|
cserver.getPluginManager().callEvent(playerQuitEvent);
|
2011-01-30 13:51:20 +01:00
|
|
|
// CraftBukkit end
|
2011-04-03 19:02:35 +02:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
this.playerFileData.a(entityplayer);
|
2011-05-26 14:48:22 +02:00
|
|
|
this.server.a(entityplayer.dimension).kill(entityplayer);
|
2011-04-20 19:05:14 +02:00
|
|
|
this.players.remove(entityplayer);
|
2011-05-26 14:48:22 +02:00
|
|
|
this.a(entityplayer.dimension).removePlayer(entityplayer);
|
2011-04-03 19:02:35 +02:00
|
|
|
|
|
|
|
return playerQuitEvent.getQuitMessage(); // CraftBukkit
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2011-01-30 13:51:20 +01:00
|
|
|
|
2011-04-20 22:47:26 +02:00
|
|
|
public EntityPlayer a(NetLoginHandler netloginhandler, String s) {
|
2011-01-11 09:25:13 +01:00
|
|
|
// CraftBukkit start - note: this entire method needs to be changed
|
2010-12-28 23:22:26 +01:00
|
|
|
// Instead of kicking then returning, we need to store the kick reason
|
|
|
|
// in the event, check with plugins to see if it's ok, and THEN kick
|
2011-02-05 19:15:04 +01:00
|
|
|
// depending on the outcome. Also change any reference to this.e.c to entity.world
|
2011-05-26 14:48:22 +02:00
|
|
|
EntityPlayer entity = new EntityPlayer(this.server, this.server.a(0), s, new ItemInWorldManager(this.server.a(0)));
|
2011-01-29 22:50:29 +01:00
|
|
|
Player player = (entity == null) ? null : (Player) entity.getBukkitEntity();
|
2011-03-26 22:32:56 +01:00
|
|
|
PlayerLoginEvent event = new PlayerLoginEvent(player);
|
2011-01-11 09:25:13 +01:00
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
String s1 = netloginhandler.networkManager.getSocketAddress().toString();
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
s1 = s1.substring(s1.indexOf("/") + 1);
|
|
|
|
s1 = s1.substring(0, s1.indexOf(":"));
|
2010-12-28 23:22:26 +01:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
if (this.banByName.contains(s.trim().toLowerCase())) {
|
2010-12-28 23:22:26 +01:00
|
|
|
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, "You are banned from this server!");
|
2011-05-14 16:29:42 +02:00
|
|
|
// return null // CraftBukkit
|
2011-04-20 19:05:14 +02:00
|
|
|
} else if (!this.isWhitelisted(s)) {
|
2011-03-20 07:08:00 +01:00
|
|
|
event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, "You are not white-listed on this server!");
|
2011-05-26 14:48:22 +02:00
|
|
|
} else if (this.banByIP.contains(s1)) {
|
2010-12-28 23:22:26 +01:00
|
|
|
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, "Your IP address is banned from this server!");
|
2011-04-20 19:05:14 +02:00
|
|
|
} else if (this.players.size() >= this.maxPlayers) {
|
2010-12-28 23:22:26 +01:00
|
|
|
event.disallow(PlayerLoginEvent.Result.KICK_FULL, "The server is full!");
|
2011-03-18 08:03:03 +01:00
|
|
|
} else {
|
2011-05-26 14:48:22 +02:00
|
|
|
event.disallow(PlayerLoginEvent.Result.ALLOWED, s1);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2011-01-01 14:06:04 +01:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
cserver.getPluginManager().callEvent(event);
|
2010-12-28 23:22:26 +01:00
|
|
|
if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
|
2011-04-20 19:05:14 +02:00
|
|
|
netloginhandler.disconnect(event.getKickMessage());
|
2010-12-26 03:20:29 +01:00
|
|
|
return null;
|
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
|
2011-01-29 22:50:29 +01:00
|
|
|
|
|
|
|
if (entityplayer.name.equalsIgnoreCase(s)) {
|
2011-04-20 19:05:14 +02:00
|
|
|
entityplayer.netServerHandler.disconnect("You logged in from another location");
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
return new EntityPlayer(this.server, this.server.a(0), s, new ItemInWorldManager(this.server.a(0)));
|
2011-01-29 22:50:29 +01:00
|
|
|
// CraftBukkit end
|
2010-12-28 20:52:24 +01:00
|
|
|
}
|
2010-12-26 03:20:29 +01:00
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
// CraftBukkit start
|
2011-05-26 14:48:22 +02:00
|
|
|
public EntityPlayer a(EntityPlayer entityplayer, int i) {
|
2011-05-28 22:50:08 +02:00
|
|
|
return a(entityplayer, i, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
public EntityPlayer a(EntityPlayer entityplayer, int i, boolean spawn) {
|
2011-05-26 14:48:22 +02:00
|
|
|
this.server.b(entityplayer.dimension).trackPlayer(entityplayer);
|
|
|
|
this.server.b(entityplayer.dimension).untrackEntity(entityplayer);
|
|
|
|
this.a(entityplayer.dimension).removePlayer(entityplayer);
|
2011-04-20 19:05:14 +02:00
|
|
|
this.players.remove(entityplayer);
|
2011-05-26 14:48:22 +02:00
|
|
|
this.server.a(entityplayer.dimension).removeEntity(entityplayer);
|
2011-05-28 22:50:08 +02:00
|
|
|
ChunkCoordinates chunkcoordinates = entityplayer.M();
|
2011-05-26 14:48:22 +02:00
|
|
|
|
|
|
|
entityplayer.dimension = i;
|
|
|
|
EntityPlayer entityplayer1 = new EntityPlayer(this.server, this.server.a(entityplayer.dimension), entityplayer.name, new ItemInWorldManager(this.server.a(entityplayer.dimension)));
|
2011-01-29 22:50:29 +01:00
|
|
|
|
|
|
|
entityplayer1.id = entityplayer.id;
|
2011-04-20 19:05:14 +02:00
|
|
|
entityplayer1.netServerHandler = entityplayer.netServerHandler;
|
2011-05-28 22:50:08 +02:00
|
|
|
entityplayer1.netServerHandler.player = entityplayer1;
|
2011-05-26 14:48:22 +02:00
|
|
|
WorldServer worldserver = this.server.a(entityplayer.dimension);
|
2011-05-14 16:29:42 +02:00
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
entityplayer1.dimension = i;
|
2011-05-14 16:29:42 +02:00
|
|
|
entityplayer1.displayName = entityplayer.displayName;
|
|
|
|
entityplayer1.compassTarget = entityplayer.compassTarget;
|
|
|
|
entityplayer1.fauxSleeping = entityplayer.fauxSleeping;
|
2011-04-20 19:05:14 +02:00
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
if (spawn) {
|
|
|
|
if(chunkcoordinates != null) {
|
|
|
|
ChunkCoordinates chunkcoordinates1 = EntityHuman.getBed(this.server.a(entityplayer.dimension), chunkcoordinates);
|
2011-03-31 22:40:00 +02:00
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
if (chunkcoordinates1 != null) {
|
|
|
|
entityplayer1.setPositionRotation((double) ((float) chunkcoordinates1.x + 0.5F), (double) ((float) chunkcoordinates1.y + 0.1F), (double) ((float) chunkcoordinates1.z + 0.5F), 0.0F, 0.0F);
|
|
|
|
entityplayer1.a(chunkcoordinates);
|
|
|
|
} else {
|
|
|
|
entityplayer1.netServerHandler.sendPacket(new Packet70Bed(0));
|
|
|
|
}
|
2011-03-31 22:40:00 +02:00
|
|
|
}
|
|
|
|
}
|
2011-05-28 22:50:08 +02:00
|
|
|
else {
|
|
|
|
entityplayer1.setPositionRotation(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
|
|
|
|
entityplayer1.inventory = entityplayer.inventory;
|
|
|
|
entityplayer1.activeContainer = entityplayer.activeContainer;
|
|
|
|
entityplayer1.defaultContainer = entityplayer.defaultContainer;
|
|
|
|
}
|
2011-01-29 22:50:29 +01:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
Player respawnPlayer = cserver.getPlayer(entityplayer);
|
2011-02-04 16:04:28 +01:00
|
|
|
Location respawnLocation = new Location(respawnPlayer.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
|
2011-02-23 13:56:36 +01:00
|
|
|
|
2011-05-14 16:29:42 +02:00
|
|
|
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, respawnLocation);
|
2011-04-20 19:05:14 +02:00
|
|
|
cserver.getPluginManager().callEvent(respawnEvent);
|
2011-02-23 13:56:36 +01:00
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
worldserver = ((CraftWorld)respawnEvent.getRespawnLocation().getWorld()).getHandle();
|
2011-02-04 16:04:28 +01:00
|
|
|
entityplayer1.locX = respawnEvent.getRespawnLocation().getX();
|
|
|
|
entityplayer1.locY = respawnEvent.getRespawnLocation().getY();
|
|
|
|
entityplayer1.locZ = respawnEvent.getRespawnLocation().getZ();
|
|
|
|
entityplayer1.yaw = respawnEvent.getRespawnLocation().getYaw();
|
|
|
|
entityplayer1.pitch = respawnEvent.getRespawnLocation().getPitch();
|
|
|
|
// CraftBukkit end
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
worldserver.chunkProviderServer.getChunkAt((int) entityplayer1.locX >> 4, (int) entityplayer1.locZ >> 4);
|
|
|
|
|
|
|
|
while (worldserver.getEntities(entityplayer1, entityplayer1.boundingBox).size() != 0) {
|
|
|
|
entityplayer1.setPosition(entityplayer1.locX, entityplayer1.locY + 1.0D, entityplayer1.locZ);
|
|
|
|
}
|
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
byte actualDimension = (byte) (worldserver.getWorld().getEnvironment().getId());
|
|
|
|
entityplayer1.netServerHandler.sendPacket(new Packet9Respawn((byte) (actualDimension >= 0 ? -1 : 0))); // CraftBukkit
|
|
|
|
entityplayer1.netServerHandler.sendPacket(new Packet9Respawn(actualDimension)); // CraftBukkit
|
2011-04-20 19:05:14 +02:00
|
|
|
entityplayer1.netServerHandler.a(entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
|
2011-05-26 14:48:22 +02:00
|
|
|
this.a(entityplayer1, worldserver);
|
|
|
|
this.a(entityplayer1.dimension).addPlayer(entityplayer1);
|
|
|
|
worldserver.addEntity(entityplayer1);
|
2011-04-20 19:05:14 +02:00
|
|
|
this.players.add(entityplayer1);
|
2011-05-28 22:50:08 +02:00
|
|
|
if (spawn) entityplayer1.syncInventory(); // CraftBukkit
|
|
|
|
entityplayer1.a(entityplayer1.activeContainer);
|
2011-04-20 22:47:26 +02:00
|
|
|
entityplayer1.w();
|
2011-01-29 22:50:29 +01:00
|
|
|
return entityplayer1;
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
// CraftBukkit - changed signature
|
|
|
|
public EntityPlayer f(EntityPlayer entityplayer) {
|
2011-05-26 14:48:22 +02:00
|
|
|
WorldServer worldserver = this.server.a(entityplayer.dimension);
|
|
|
|
boolean flag = false;
|
|
|
|
byte b0;
|
|
|
|
|
|
|
|
if (entityplayer.dimension == -1) {
|
|
|
|
b0 = 0;
|
|
|
|
} else {
|
|
|
|
b0 = -1;
|
|
|
|
}
|
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
// CraftBukkit start
|
|
|
|
// entityplayer.dimension = b0;
|
|
|
|
WorldServer worldserver1 = this.server.a(b0);
|
2011-05-26 14:48:22 +02:00
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
// entityplayer.netServerHandler.sendPacket(new Packet9Respawn((byte) ((WorldServer)entityplayer.world).getWorld().getEnvironment().getId()));
|
|
|
|
// Craftbukkit end
|
2011-05-26 14:48:22 +02:00
|
|
|
worldserver.removeEntity(entityplayer);
|
|
|
|
entityplayer.dead = false;
|
|
|
|
double d0 = entityplayer.locX;
|
|
|
|
double d1 = entityplayer.locZ;
|
|
|
|
double d2 = 8.0D;
|
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
if (b0 == -1) { // CraftBukkit
|
2011-05-26 14:48:22 +02:00
|
|
|
d0 /= d2;
|
|
|
|
d1 /= d2;
|
|
|
|
entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch);
|
2011-05-28 22:50:08 +02:00
|
|
|
if (entityplayer.S()) {
|
2011-05-26 14:48:22 +02:00
|
|
|
worldserver.entityJoinedWorld(entityplayer, false);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
d0 *= d2;
|
|
|
|
d1 *= d2;
|
|
|
|
entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch);
|
2011-05-28 22:50:08 +02:00
|
|
|
if (entityplayer.S()) {
|
2011-05-26 14:48:22 +02:00
|
|
|
worldserver.entityJoinedWorld(entityplayer, false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-28 22:50:08 +02:00
|
|
|
if (entityplayer.S()) {
|
|
|
|
// worldserver1.addEntity(entityplayer); // CraftBukkit
|
2011-05-26 14:48:22 +02:00
|
|
|
entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch);
|
|
|
|
worldserver1.entityJoinedWorld(entityplayer, false);
|
|
|
|
worldserver1.chunkProviderServer.a = true;
|
|
|
|
(new PortalTravelAgent()).a(worldserver1, entityplayer);
|
|
|
|
worldserver1.chunkProviderServer.a = false;
|
|
|
|
}
|
2011-05-28 22:50:08 +02:00
|
|
|
/* CraftBukkit start
|
2011-05-26 14:48:22 +02:00
|
|
|
this.a(entityplayer);
|
|
|
|
entityplayer.netServerHandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
|
|
|
|
entityplayer.a((World) worldserver1);
|
|
|
|
this.a(entityplayer, worldserver1);
|
2011-05-28 22:50:08 +02:00
|
|
|
this.g(entityplayer);
|
|
|
|
*/ // CraftBukkit end
|
|
|
|
return a(entityplayer, b0, false);
|
2011-05-26 14:48:22 +02:00
|
|
|
}
|
|
|
|
|
2010-12-26 03:20:29 +01:00
|
|
|
public void b() {
|
2011-05-26 23:15:27 +02:00
|
|
|
// Craftbukkit start
|
|
|
|
for (int i = 0; i < this.server.worlds.size(); ++i) {
|
|
|
|
this.server.worlds.get(i).manager.flush();
|
2011-02-06 23:53:48 +01:00
|
|
|
}
|
2011-05-26 23:15:27 +02:00
|
|
|
// Craftbukkit end
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
public void flagDirty(int i, int j, int k, int l) {
|
|
|
|
this.a(l).flagDirty(i, j, k);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
public void sendAll(Packet packet) {
|
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
entityplayer.netServerHandler.sendPacket(packet);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
public void a(Packet packet, int i) {
|
|
|
|
for (int j = 0; j < this.players.size(); ++j) {
|
|
|
|
EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
|
|
|
|
|
|
|
|
if (entityplayer.dimension == i) {
|
|
|
|
entityplayer.netServerHandler.sendPacket(packet);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-26 03:20:29 +01:00
|
|
|
public String c() {
|
2010-12-28 20:52:24 +01:00
|
|
|
String s = "";
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
2011-01-29 22:50:29 +01:00
|
|
|
if (i > 0) {
|
|
|
|
s = s + ", ";
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2011-01-29 22:50:29 +01:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
s = s + ((EntityPlayer) this.players.get(i)).name;
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
|
|
|
return s;
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public void a(String s) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByName.add(s.toLowerCase());
|
2011-02-23 03:37:56 +01:00
|
|
|
this.h();
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public void b(String s) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByName.remove(s.toLowerCase());
|
2011-02-23 03:37:56 +01:00
|
|
|
this.h();
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
private void g() {
|
2010-12-26 03:20:29 +01:00
|
|
|
try {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByName.clear();
|
2011-02-23 03:37:56 +01:00
|
|
|
BufferedReader bufferedreader = new BufferedReader(new FileReader(this.j));
|
2011-01-29 22:50:29 +01:00
|
|
|
String s = "";
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
while ((s = bufferedreader.readLine()) != null) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByName.add(s.trim().toLowerCase());
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
|
|
|
bufferedreader.close();
|
|
|
|
} catch (Exception exception) {
|
2011-01-29 22:50:29 +01:00
|
|
|
a.warning("Failed to load ban list: " + exception);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
private void h() {
|
2010-12-26 03:20:29 +01:00
|
|
|
try {
|
2011-02-23 03:37:56 +01:00
|
|
|
PrintWriter printwriter = new PrintWriter(new FileWriter(this.j, false));
|
2011-04-20 19:05:14 +02:00
|
|
|
Iterator iterator = this.banByName.iterator();
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
while (iterator.hasNext()) {
|
|
|
|
String s = (String) iterator.next();
|
|
|
|
|
|
|
|
printwriter.println(s);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
|
|
|
printwriter.close();
|
|
|
|
} catch (Exception exception) {
|
2011-01-29 22:50:29 +01:00
|
|
|
a.warning("Failed to save ban list: " + exception);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public void c(String s) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByIP.add(s.toLowerCase());
|
2011-02-23 03:37:56 +01:00
|
|
|
this.j();
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public void d(String s) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByIP.remove(s.toLowerCase());
|
2011-02-23 03:37:56 +01:00
|
|
|
this.j();
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
private void i() {
|
2010-12-26 03:20:29 +01:00
|
|
|
try {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByIP.clear();
|
2011-02-23 03:37:56 +01:00
|
|
|
BufferedReader bufferedreader = new BufferedReader(new FileReader(this.k));
|
2011-01-29 22:50:29 +01:00
|
|
|
String s = "";
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
while ((s = bufferedreader.readLine()) != null) {
|
2011-04-20 19:05:14 +02:00
|
|
|
this.banByIP.add(s.trim().toLowerCase());
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
|
|
|
bufferedreader.close();
|
|
|
|
} catch (Exception exception) {
|
2011-01-29 22:50:29 +01:00
|
|
|
a.warning("Failed to load ip ban list: " + exception);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
private void j() {
|
2010-12-26 03:20:29 +01:00
|
|
|
try {
|
2011-02-23 03:37:56 +01:00
|
|
|
PrintWriter printwriter = new PrintWriter(new FileWriter(this.k, false));
|
2011-04-20 19:05:14 +02:00
|
|
|
Iterator iterator = this.banByIP.iterator();
|
2011-01-29 22:50:29 +01:00
|
|
|
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
String s = (String) iterator.next();
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
printwriter.println(s);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
|
|
|
printwriter.close();
|
|
|
|
} catch (Exception exception) {
|
2011-01-29 22:50:29 +01:00
|
|
|
a.warning("Failed to save ip ban list: " + exception);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public void e(String s) {
|
2011-01-29 22:50:29 +01:00
|
|
|
this.h.add(s.toLowerCase());
|
2011-02-23 03:37:56 +01:00
|
|
|
this.l();
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public void f(String s) {
|
2011-01-29 22:50:29 +01:00
|
|
|
this.h.remove(s.toLowerCase());
|
2011-02-23 03:37:56 +01:00
|
|
|
this.l();
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
private void k() {
|
2010-12-26 03:20:29 +01:00
|
|
|
try {
|
2011-01-29 22:50:29 +01:00
|
|
|
this.h.clear();
|
2011-02-23 03:37:56 +01:00
|
|
|
BufferedReader bufferedreader = new BufferedReader(new FileReader(this.l));
|
2011-01-29 22:50:29 +01:00
|
|
|
String s = "";
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
while ((s = bufferedreader.readLine()) != null) {
|
|
|
|
this.h.add(s.trim().toLowerCase());
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
|
|
|
bufferedreader.close();
|
|
|
|
} catch (Exception exception) {
|
2011-05-14 16:29:42 +02:00
|
|
|
// CraftBukkit - corrected text
|
|
|
|
a.warning("Failed to load ops: " + exception);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
private void l() {
|
2010-12-26 03:20:29 +01:00
|
|
|
try {
|
2011-02-23 03:37:56 +01:00
|
|
|
PrintWriter printwriter = new PrintWriter(new FileWriter(this.l, false));
|
2011-01-29 22:50:29 +01:00
|
|
|
Iterator iterator = this.h.iterator();
|
|
|
|
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
String s = (String) iterator.next();
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
printwriter.println(s);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
|
|
|
printwriter.close();
|
|
|
|
} catch (Exception exception) {
|
2011-05-14 16:29:42 +02:00
|
|
|
// CraftBukkit - corrected text
|
|
|
|
a.warning("Failed to save ops: " + exception);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
private void m() {
|
|
|
|
try {
|
|
|
|
this.i.clear();
|
|
|
|
BufferedReader bufferedreader = new BufferedReader(new FileReader(this.m));
|
|
|
|
String s = "";
|
|
|
|
|
|
|
|
while ((s = bufferedreader.readLine()) != null) {
|
|
|
|
this.i.add(s.trim().toLowerCase());
|
|
|
|
}
|
|
|
|
|
|
|
|
bufferedreader.close();
|
|
|
|
} catch (Exception exception) {
|
|
|
|
a.warning("Failed to load white-list: " + exception);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private void n() {
|
|
|
|
try {
|
|
|
|
PrintWriter printwriter = new PrintWriter(new FileWriter(this.m, false));
|
|
|
|
Iterator iterator = this.i.iterator();
|
|
|
|
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
String s = (String) iterator.next();
|
|
|
|
|
|
|
|
printwriter.println(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
printwriter.close();
|
|
|
|
} catch (Exception exception) {
|
|
|
|
a.warning("Failed to save white-list: " + exception);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
public boolean isWhitelisted(String s) {
|
2011-02-23 03:37:56 +01:00
|
|
|
s = s.trim().toLowerCase();
|
|
|
|
return !this.o || this.h.contains(s) || this.i.contains(s);
|
|
|
|
}
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
public boolean isOp(String s) {
|
2011-01-29 22:50:29 +01:00
|
|
|
return this.h.contains(s.trim().toLowerCase());
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
public EntityPlayer i(String s) {
|
2011-04-20 19:05:14 +02:00
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
if (entityplayer.name.equalsIgnoreCase(s)) {
|
|
|
|
return entityplayer;
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2010-12-26 03:20:29 +01:00
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public void a(String s, String s1) {
|
2011-02-23 03:37:56 +01:00
|
|
|
EntityPlayer entityplayer = this.i(s);
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
if (entityplayer != null) {
|
2011-04-20 19:05:14 +02:00
|
|
|
entityplayer.netServerHandler.sendPacket(new Packet3Chat(s1));
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
public void a(double d0, double d1, double d2, double d3, int i, Packet packet) {
|
|
|
|
this.a((EntityHuman) null, d0, d1, d2, d3, i, packet);
|
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-05-26 14:48:22 +02:00
|
|
|
public void a(EntityHuman entityhuman, double d0, double d1, double d2, double d3, int i, Packet packet) {
|
|
|
|
for (int j = 0; j < this.players.size(); ++j) {
|
|
|
|
EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
|
|
|
|
|
|
|
|
if (entityplayer != entityhuman && entityplayer.dimension == i) {
|
|
|
|
double d4 = d0 - entityplayer.locX;
|
|
|
|
double d5 = d1 - entityplayer.locY;
|
|
|
|
double d6 = d2 - entityplayer.locZ;
|
|
|
|
|
|
|
|
if (d4 * d4 + d5 * d5 + d6 * d6 < d3 * d3) {
|
|
|
|
entityplayer.netServerHandler.sendPacket(packet);
|
|
|
|
}
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-23 03:37:56 +01:00
|
|
|
public void j(String s) {
|
2010-12-28 20:52:24 +01:00
|
|
|
Packet3Chat packet3chat = new Packet3Chat(s);
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
if (this.isOp(entityplayer.name)) {
|
|
|
|
entityplayer.netServerHandler.sendPacket(packet3chat);
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-28 20:52:24 +01:00
|
|
|
public boolean a(String s, Packet packet) {
|
2011-02-23 03:37:56 +01:00
|
|
|
EntityPlayer entityplayer = this.i(s);
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
if (entityplayer != null) {
|
2011-04-20 19:05:14 +02:00
|
|
|
entityplayer.netServerHandler.sendPacket(packet);
|
2010-12-26 03:20:29 +01:00
|
|
|
return true;
|
2010-12-28 20:52:24 +01:00
|
|
|
} else {
|
|
|
|
return false;
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-20 19:05:14 +02:00
|
|
|
public void savePlayers() {
|
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
this.playerFileData.a((EntityHuman) this.players.get(i));
|
2010-12-26 03:20:29 +01:00
|
|
|
}
|
|
|
|
}
|
2010-12-28 20:52:24 +01:00
|
|
|
|
2011-01-29 22:50:29 +01:00
|
|
|
public void a(int i, int j, int k, TileEntity tileentity) {}
|
2011-02-23 03:37:56 +01:00
|
|
|
|
|
|
|
public void k(String s) {
|
|
|
|
this.i.add(s);
|
|
|
|
this.n();
|
|
|
|
}
|
|
|
|
|
|
|
|
public void l(String s) {
|
|
|
|
this.i.remove(s);
|
|
|
|
this.n();
|
|
|
|
}
|
|
|
|
|
|
|
|
public Set e() {
|
|
|
|
return this.i;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void f() {
|
|
|
|
this.m();
|
|
|
|
}
|
2011-05-26 14:48:22 +02:00
|
|
|
|
|
|
|
public void a(EntityPlayer entityplayer, WorldServer worldserver) {
|
2011-05-28 22:50:08 +02:00
|
|
|
entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(worldserver.getTime()));
|
2011-05-26 14:48:22 +02:00
|
|
|
if (worldserver.v()) {
|
|
|
|
entityplayer.netServerHandler.sendPacket(new Packet70Bed(1));
|
|
|
|
}
|
|
|
|
}
|
2011-05-28 22:50:08 +02:00
|
|
|
|
|
|
|
public void g(EntityPlayer entityplayer) {
|
|
|
|
entityplayer.a(entityplayer.defaultContainer);
|
|
|
|
entityplayer.B();
|
|
|
|
}
|
2011-02-23 13:56:36 +01:00
|
|
|
}
|