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

Update to Minecraft 1.12-pre6

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-30 21:25:59 +10:00
parent f69eb04edc
commit ea6ca4328a
35 changed files with 297 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@@ -391,7 +391,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
getHandle().aF(); // PAIL: rename
getHandle().ejectPassengers();
return true;
}

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

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View File

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