From e13d1196863d5dcfea3d17b79238427dfb2c61b2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 30 May 2017 21:25:59 +1000
Subject: Update to Minecraft 1.12-pre6

---
 src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java    | 2 +-
 src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java  | 4 ++--
 src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 6e9ee1af..2e81ea86 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -391,7 +391,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
             return false;
         }
 
-        getHandle().aF(); // PAIL: rename
+        getHandle().ejectPassengers();
         return true;
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
index a2496e79..a252b91b 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
@@ -76,7 +76,7 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
     public ChatColor getColor() throws IllegalStateException {
         CraftScoreboard scoreboard = checkState();
 
-        return CraftChatMessage.getColor(team.m()); // PAIL: rename
+        return CraftChatMessage.getColor(team.getColor()); // PAIL: rename
     }
 
     @Override
@@ -84,7 +84,7 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
         Validate.notNull(color, "Color cannot be null");
         CraftScoreboard scoreboard = checkState();
 
-        team.a(CraftChatMessage.getColor(color)); // PAIL: rename
+        team.setColor(CraftChatMessage.getColor(color)); // PAIL: rename
     }
 
     public boolean allowFriendlyFire() throws IllegalStateException {
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
index 598d088f..dbbed1be 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
@@ -36,7 +36,7 @@ public final class CraftChatMessage {
     }
 
     public static ChatColor getColor(EnumChatFormat format) {
-        return ChatColor.getByChar(format.z);
+        return ChatColor.getByChar(format.character);
     }
 
     private static class StringMessage {
-- 
cgit v1.2.3