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

Update CraftBukkit to 1.6.2

Browse Source
This commit is contained in:
mbax
2013-07-08 19:43:37 -04:00
parent 2d9a9d8cea
commit f6a0b1e426
87 changed files with 1162 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package net.minecraft.server;
import com.google.common.base.Charsets;
import java.io.File;
import java.net.SocketAddress;
import java.text.SimpleDateFormat;
@@ -91,6 +92,7 @@ public abstract class PlayerList {
entityplayer.getBukkitEntity().sendSupportedChannels();
// CraftBukkit end
playerconnection.sendPacket(new Packet250CustomPayload("MC|Brand", this.getServer().getServerModName().getBytes(Charsets.UTF_8)));
playerconnection.sendPacket(new Packet6SpawnPosition(chunkcoordinates.x, chunkcoordinates.y, chunkcoordinates.z));
playerconnection.sendPacket(new Packet202Abilities(entityplayer.abilities));
playerconnection.sendPacket(new Packet16BlockItemSwitch(entityplayer.inventory.itemInHandIndex));
@@ -260,9 +262,9 @@ public abstract class PlayerList {
this.b(entityplayer);
WorldServer worldserver = entityplayer.p();
if (entityplayer.vehicle != null) {
if (entityplayer.vehicle != null && !(entityplayer.vehicle instanceof EntityPlayer)) { // CraftBukkit - Don't remove players
worldserver.removeEntity(entityplayer.vehicle);
System.out.println("removing player mount");
// System.out.println("removing player mount"); // CraftBukkit - Removed debug message
}
worldserver.kill(entityplayer);
@@ -840,8 +842,8 @@ public abstract class PlayerList {
if ((world == null || entityplayer.world == world) && (s == null || flag1 != s.equalsIgnoreCase(entityplayer.getLocalizedName()))) {
if (s1 != null) {
ScoreboardTeam scoreboardteam = entityplayer.getScoreboardTeam();
String s2 = scoreboardteam == null ? "" : scoreboardteam.getName();
ScoreboardTeamBase scoreboardteambase = entityplayer.getScoreboardTeam();
String s2 = scoreboardteambase == null ? "" : scoreboardteambase.getName();
if (flag2 == s1.equalsIgnoreCase(s2)) {
continue;