summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-08 18:00:00 +1000
committermd_5 <git@md-5.net>2017-06-08 18:00:00 +1000
commitbb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772 (patch)
treea8e03741d518f6448cf4c5410b194a4396fede5e /src/main/java/org
parentfe3ca95c764848be56e872e3de57c66cb07d7515 (diff)
downloadcraftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.gz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.lz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.xz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.zip
Update to Minecraft 1.12
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftSound.java3
-rw-r--r--src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
index 9588ba11..8871c6f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
@@ -553,6 +553,9 @@ public enum CraftSound {
RECORD_WAIT("record.wait"),
RECORD_WARD("record.ward"),
UI_BUTTON_CLICK("ui.button.click"),
+ UI_TOAST_CHALLENGE_COMPLETE("ui.toast.challenge_complete"),
+ UI_TOAST_IN("ui.toast.in"),
+ UI_TOAST_OUT("ui.toast.out"),
WEATHER_RAIN("weather.rain"),
WEATHER_RAIN_ABOVE("weather.rain.above");
private final String minecraftKey;
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
index a252b91b..38db6c3d 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.getColor()); // PAIL: rename
+ return CraftChatMessage.getColor(team.getColor());
}
@Override
@@ -84,7 +84,7 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
Validate.notNull(color, "Color cannot be null");
CraftScoreboard scoreboard = checkState();
- team.setColor(CraftChatMessage.getColor(color)); // PAIL: rename
+ team.setColor(CraftChatMessage.getColor(color));
}
public boolean allowFriendlyFire() throws IllegalStateException {