[Auto] Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 95ff95ed #588: Add Player#sendBlockDamage() CraftBukkit Changes: ea050e6e9 #807: Add Player#sendBlockDamage()
This commit is contained in:
@@ -1829,10 +1829,10 @@ index 96b55867d8bfbc85cb290da9b320ec74b9dbb179..513d24877c336b6e32f2ef939788d108
|
||||
player.activeContainer.addSlotListener(player);
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560fb52ca19 100644
|
||||
index 1cbf0fd6c0f2d1fa62f944162cd9320c640d8530..5f55e3816f1e00be6e4ae573cc09eb19b59adf74 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -239,14 +239,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -240,14 +240,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
@Override
|
||||
public String getDisplayName() {
|
||||
@@ -1872,7 +1872,7 @@ index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560
|
||||
@Override
|
||||
public String getPlayerListName() {
|
||||
return getHandle().listName == null ? getName() : CraftChatMessage.fromComponent(getHandle().listName);
|
||||
@@ -265,35 +290,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -266,35 +291,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1916,7 +1916,7 @@ index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560
|
||||
updatePlayerListHeaderFooter();
|
||||
}
|
||||
|
||||
@@ -301,8 +326,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -302,8 +327,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
if (getHandle().playerConnection == null) return;
|
||||
|
||||
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
|
||||
@@ -1927,7 +1927,7 @@ index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560
|
||||
getHandle().playerConnection.sendPacket(packet);
|
||||
}
|
||||
|
||||
@@ -334,6 +359,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -335,6 +360,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
getHandle().playerConnection.disconnect(message == null ? "" : message);
|
||||
}
|
||||
|
||||
@@ -1947,7 +1947,7 @@ index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560
|
||||
@Override
|
||||
public void setCompassTarget(Location loc) {
|
||||
if (getHandle().playerConnection == null) return;
|
||||
@@ -548,6 +586,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -561,6 +599,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
getHandle().playerConnection.sendPacket(packet);
|
||||
}
|
||||
|
||||
@@ -1985,7 +1985,7 @@ index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560
|
||||
@Override
|
||||
public void sendSignChange(Location loc, String[] lines) {
|
||||
sendSignChange(loc, lines, DyeColor.BLACK);
|
||||
@@ -570,12 +639,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -583,12 +652,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
|
||||
IChatBaseComponent[] components = CraftSign.sanitizeLines(lines);
|
||||
@@ -2001,7 +2001,7 @@ index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1705,6 +1775,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1718,6 +1788,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
return (getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : getHandle().clientViewDistance;
|
||||
}
|
||||
|
||||
@@ -2014,7 +2014,7 @@ index 8428ef53e0408c4a7f74cc03e7e238be9c2f1888..aac172afc8343f325612fdc608630560
|
||||
@Override
|
||||
public String getLocale() {
|
||||
return getHandle().locale;
|
||||
@@ -1728,6 +1804,137 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1741,6 +1817,137 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
getInventory().setItemInMainHand(hand);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user