SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.12

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-06-08 18:00:00 +10:00
parent 7b45ff54ad
commit ea595a5dcf
32 changed files with 65 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
paper-server/src/main/java/org/bukkit/craftbukkit/CraftSound.java
View File

@@ -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;

4
paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
View File

@@ -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 {