Update CraftBukkit to 1.6.2

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index b98a0787..f24ba954 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -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;