Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
src/main/java/net/minecraft/server/PlayerList.java
View File

@@ -8,8 +8,9 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
import java.util.Map.Entry;
// CraftBukkit start
import org.bukkit.Location;
@@ -32,21 +33,20 @@ import org.bukkit.Bukkit;
public abstract class PlayerList {
private static final SimpleDateFormat e = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
public static final Logger a = Logger.getLogger("Minecraft");
private static final SimpleDateFormat d = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
private final MinecraftServer server;
public final List players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety
private final BanList banByName = new BanList(new File("banned-players.txt"));
private final BanList banByIP = new BanList(new File("banned-ips.txt"));
private Set operators = new HashSet();
private Set whitelist = new java.util.LinkedHashSet(); // CraftBukkit - HashSet -> LinkedHashSet
public PlayerFileData playerFileData; // CraftBukkit - private -> public
public IPlayerFileData playerFileData; // CraftBukkit - private -> public
public boolean hasWhitelist; // CraftBukkit - private -> public
protected int maxPlayers;
protected int d;
private EnumGamemode m;
private boolean n;
private int o = 0;
protected int c;
private EnumGamemode l;
private boolean m;
private int n = 0;
// CraftBukkit start
private CraftServer cserver;
@@ -64,7 +64,8 @@ public abstract class PlayerList {
}
public void a(INetworkManager inetworkmanager, EntityPlayer entityplayer) {
this.a(entityplayer);
NBTTagCompound nbttagcompound = this.a(entityplayer);
entityplayer.spawnIn(this.server.getWorldServer(entityplayer.dimension));
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
String s = "local";
@@ -74,7 +75,7 @@ public abstract class PlayerList {
}
// CraftBukkit - add world and location to 'logged in' message.
a.info(entityplayer.name + "[" + s + "] logged in with entity id " + entityplayer.id + " at ([" + entityplayer.world.worldData.getName() + "] " + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
this.server.getLogger().info(entityplayer.name + "[" + s + "] logged in with entity id " + entityplayer.id + " at ([" + entityplayer.world.worldData.getName() + "] " + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
ChunkCoordinates chunkcoordinates = worldserver.getSpawn();
@@ -93,8 +94,9 @@ public abstract class PlayerList {
playerconnection.sendPacket(new Packet6SpawnPosition(chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z));
playerconnection.sendPacket(new Packet202Abilities(entityplayer.abilities));
playerconnection.sendPacket(new Packet16BlockItemSwitch(entityplayer.inventory.itemInHandIndex));
this.a((ScoreboardServer) worldserver.getScoreboard(), entityplayer);
this.b(entityplayer, worldserver);
// this.sendAll(new Packet3Chat("\u00A7e" + entityplayer.name + " joined the game.")); // CraftBukkit - handled in event
// this.sendAll(new Packet3Chat(EnumChatFormat.YELLOW + entityplayer.getScoreboardDisplayName() + EnumChatFormat.YELLOW + " joined the game.")); // CraftBukkit - handled in event
this.c(entityplayer);
playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
this.server.ae().a(playerconnection);
@@ -112,6 +114,44 @@ public abstract class PlayerList {
}
entityplayer.syncInventory();
if (nbttagcompound != null && nbttagcompound.hasKey("Riding")) {
Entity entity = EntityTypes.a(nbttagcompound.getCompound("Riding"), worldserver);
if (entity != null) {
entity.p = true;
worldserver.addEntity(entity);
entityplayer.mount(entity);
entity.p = false;
}
}
}
protected void a(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
HashSet hashset = new HashSet();
Iterator iterator = scoreboardserver.g().iterator();
while (iterator.hasNext()) {
ScoreboardTeam scoreboardteam = (ScoreboardTeam) iterator.next();
entityplayer.playerConnection.sendPacket(new Packet209SetScoreboardTeam(scoreboardteam, 0));
}
for (int i = 0; i < 3; ++i) {
ScoreboardObjective scoreboardobjective = scoreboardserver.a(i);
if (scoreboardobjective != null && !hashset.contains(scoreboardobjective)) {
List list = scoreboardserver.d(scoreboardobjective);
Iterator iterator1 = list.iterator();
while (iterator1.hasNext()) {
Packet packet = (Packet) iterator1.next();
entityplayer.playerConnection.sendPacket(packet);
}
hashset.add(scoreboardobjective);
}
}
}
public void setPlayerFileData(WorldServer[] aworldserver) {
@@ -120,7 +160,7 @@ public abstract class PlayerList {
}
public void a(EntityPlayer entityplayer, WorldServer worldserver) {
WorldServer worldserver1 = entityplayer.p();
WorldServer worldserver1 = entityplayer.o();
if (worldserver != null) {
worldserver.getPlayerChunkMap().removePlayer(entityplayer);
@@ -134,14 +174,19 @@ public abstract class PlayerList {
return PlayerChunkMap.getFurthestViewableBlock(this.o());
}
public void a(EntityPlayer entityplayer) {
public NBTTagCompound a(EntityPlayer entityplayer) {
NBTTagCompound nbttagcompound = this.server.worlds.get(0).getWorldData().i(); // CraftBukkit
NBTTagCompound nbttagcompound1;
if (entityplayer.getName().equals(this.server.H()) && nbttagcompound != null) {
entityplayer.e(nbttagcompound);
entityplayer.f(nbttagcompound);
nbttagcompound1 = nbttagcompound;
System.out.println("loading single player");
} else {
this.playerFileData.load(entityplayer);
nbttagcompound1 = this.playerFileData.load(entityplayer);
}
return nbttagcompound1;
}
protected void b(EntityPlayer entityplayer) {
@@ -198,7 +243,7 @@ public abstract class PlayerList {
}
public void d(EntityPlayer entityplayer) {
entityplayer.p().getPlayerChunkMap().movePlayer(entityplayer);
entityplayer.o().getPlayerChunkMap().movePlayer(entityplayer);
}
public String disconnect(EntityPlayer entityplayer) { // CraftBukkit - return string
@@ -211,7 +256,12 @@ public abstract class PlayerList {
// CraftBukkit end
this.b(entityplayer);
WorldServer worldserver = entityplayer.p();
WorldServer worldserver = entityplayer.o();
if (entityplayer.vehicle != null) {
worldserver.kill(entityplayer.vehicle);
System.out.println("removing player mount");
}
worldserver.kill(entityplayer);
worldserver.getPlayerChunkMap().removePlayer(entityplayer);
@@ -248,7 +298,7 @@ public abstract class PlayerList {
String s1 = "You are banned from this server!\nReason: " + banentry.getReason();
if (banentry.getExpires() != null) {
s1 = s1 + "\nYour ban will be removed on " + e.format(banentry.getExpires());
s1 = s1 + "\nYour ban will be removed on " + d.format(banentry.getExpires());
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1);
@@ -264,7 +314,7 @@ public abstract class PlayerList {
String s3 = "Your IP address is banned from this server!\nReason: " + banentry1.getReason();
if (banentry1.getExpires() != null) {
s3 = s3 + "\nYour ban will be removed on " + e.format(banentry1.getExpires());
s3 = s3 + "\nYour ban will be removed on " + d.format(banentry1.getExpires());
}
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s3);
@@ -327,9 +377,9 @@ public abstract class PlayerList {
public EntityPlayer moveToWorld(EntityPlayer entityplayer, int i, boolean flag, Location location, boolean avoidSuffocation) {
// CraftBukkit end
entityplayer.p().getTracker().untrackPlayer(entityplayer);
// entityplayer.p().getTracker().untrackEntity(entityplayer); // CraftBukkit
entityplayer.p().getPlayerChunkMap().removePlayer(entityplayer);
entityplayer.o().getTracker().untrackPlayer(entityplayer);
// entityplayer.o().getTracker().untrackEntity(entityplayer); // CraftBukkit
entityplayer.o().getPlayerChunkMap().removePlayer(entityplayer);
this.players.remove(entityplayer);
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
ChunkCoordinates chunkcoordinates = entityplayer.getBed();
@@ -411,6 +461,7 @@ public abstract class PlayerList {
}
// entityplayer1.syncInventory();
// CraftBukkit end
entityplayer1.setHealth(entityplayer1.getHealth());
// CraftBukkit start - don't fire on respawn
if (fromWorld != location.getWorld()) {
@@ -651,13 +702,13 @@ public abstract class PlayerList {
}
public void tick() {
if (++this.o > 600) {
this.o = 0;
if (++this.n > 600) {
this.n = 0;
}
/* CraftBukkit start - remove updating of lag to players -- it spams way to much on big servers.
if (this.o < this.players.size()) {
EntityPlayer entityplayer = (EntityPlayer) this.players.get(this.o);
if (this.n < this.players.size()) {
EntityPlayer entityplayer = (EntityPlayer) this.players.get(this.n);
this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.ping));
}
@@ -741,7 +792,7 @@ public abstract class PlayerList {
public boolean isOp(String s) {
// CraftBukkit
return this.operators.contains(s.trim().toLowerCase()) || this.server.I() && this.server.worlds.get(0).getWorldData().allowCommands() && this.server.H().equalsIgnoreCase(s) || this.n;
return this.operators.contains(s.trim().toLowerCase()) || this.server.I() && this.server.worlds.get(0).getWorldData().allowCommands() && this.server.H().equalsIgnoreCase(s) || this.m;
}
public EntityPlayer f(String s) {
@@ -760,7 +811,7 @@ public abstract class PlayerList {
return entityplayer;
}
public List a(ChunkCoordinates chunkcoordinates, int i, int j, int k, int l, int i1, int j1) {
public List a(ChunkCoordinates chunkcoordinates, int i, int j, int k, int l, int i1, int j1, Map map, String s, String s1) {
if (this.players.isEmpty()) {
return null;
} else {
@@ -773,6 +824,32 @@ public abstract class PlayerList {
for (int i2 = 0; i2 < this.players.size(); ++i2) {
EntityPlayer entityplayer = (EntityPlayer) this.players.get(i2);
boolean flag1;
if (s != null) {
flag1 = s.startsWith("!");
if (flag1) {
s = s.substring(1);
}
if (flag1 == s.equalsIgnoreCase(entityplayer.getLocalizedName())) {
continue;
}
}
if (s1 != null) {
flag1 = s1.startsWith("!");
if (flag1) {
s1 = s1.substring(1);
}
ScoreboardTeam scoreboardteam = entityplayer.getScoreboardTeam();
String s2 = scoreboardteam == null ? "" : scoreboardteam.b();
if (flag1 == s1.equalsIgnoreCase(s2)) {
continue;
}
}
if (chunkcoordinates != null && (i > 0 || j > 0)) {
float f = chunkcoordinates.e(entityplayer.b());
@@ -782,7 +859,7 @@ public abstract class PlayerList {
}
}
if ((l == EnumGamemode.NONE.a() || l == entityplayer.playerInteractManager.getGameMode().a()) && (i1 <= 0 || entityplayer.expLevel >= i1) && entityplayer.expLevel <= j1) {
if (this.a((EntityHuman) entityplayer, map) && (l == EnumGamemode.NONE.a() || l == entityplayer.playerInteractManager.getGameMode().a()) && (i1 <= 0 || entityplayer.expLevel >= i1) && entityplayer.expLevel <= j1) {
((List) object).add(entityplayer);
}
}
@@ -803,6 +880,49 @@ public abstract class PlayerList {
}
}
private boolean a(EntityHuman entityhuman, Map map) {
if (map != null && map.size() != 0) {
Iterator iterator = map.entrySet().iterator();
Entry entry;
boolean flag;
int i;
do {
if (!iterator.hasNext()) {
return true;
}
entry = (Entry) iterator.next();
String s = (String) entry.getKey();
flag = false;
if (s.endsWith("_min") && s.length() > 4) {
flag = true;
s = s.substring(0, s.length() - 4);
}
Scoreboard scoreboard = entityhuman.getScoreboard();
ScoreboardObjective scoreboardobjective = scoreboard.b(s);
if (scoreboardobjective == null) {
return false;
}
ScoreboardScore scoreboardscore = entityhuman.getScoreboard().a(entityhuman.getLocalizedName(), scoreboardobjective);
i = scoreboardscore.c();
if (i < ((Integer) entry.getValue()).intValue() && flag) {
return false;
}
} while (i <= ((Integer) entry.getValue()).intValue() || flag);
return false;
} else {
return true;
}
}
public void sendPacketNearby(double d0, double d1, double d2, double d3, int i, Packet packet) {
this.sendPacketNearby((EntityHuman) null, d0, d1, d2, d3, i, packet);
}
@@ -854,7 +974,7 @@ public abstract class PlayerList {
public void b(EntityPlayer entityplayer, WorldServer worldserver) {
entityplayer.playerConnection.sendPacket(new Packet4UpdateTime(worldserver.getTime(), worldserver.getDayTime()));
if (worldserver.N()) {
if (worldserver.O()) {
entityplayer.playerConnection.sendPacket(new Packet70Bed(1, 0));
}
}
@@ -892,7 +1012,7 @@ public abstract class PlayerList {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
if (entityplayer.q().equals(s)) {
if (entityplayer.p().equals(s)) {
arraylist.add(entityplayer);
}
}
@@ -901,7 +1021,7 @@ public abstract class PlayerList {
}
public int o() {
return this.d;
return this.c;
}
public MinecraftServer getServer() {
@@ -915,8 +1035,8 @@ public abstract class PlayerList {
private void a(EntityPlayer entityplayer, EntityPlayer entityplayer1, World world) {
if (entityplayer1 != null) {
entityplayer.playerInteractManager.setGameMode(entityplayer1.playerInteractManager.getGameMode());
} else if (this.m != null) {
entityplayer.playerInteractManager.setGameMode(this.m);
} else if (this.l != null) {
entityplayer.playerInteractManager.setGameMode(this.l);
}
entityplayer.playerInteractManager.b(world.getWorldData().getGameType());