mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 40b3461 [ci skip] Use commit timestamp instead of build time in manifest (#6161) 664eee6 Expand resource pack API b015abb Fix missing annotation
This commit is contained in:
@@ -68,7 +68,7 @@ index bd787b4122502eacacadd8d47ea5aa5dc5e023e5..22366098d0a3f6df2ba650ef01ed4be7
|
||||
return this.stats;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 26a391223dc1595892cb8bee4815525adb593d32..ff5e61ba0cb9602a332dfc59a40b2a9776acaef4 100644
|
||||
index 0a7d339a1b52f5b70830708d5eabac3f8d85f888..d2270b53e6a8f74f7382d5c4dc4474a3a8d83fa4 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -390,6 +390,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -220,10 +220,10 @@ index 332754f541165590ecd96d650f16f40924b4263a..bfc1077dc7d5cfb48f5cc98b289b98d4
|
||||
public boolean untamedTamablesAreRidable = true;
|
||||
public boolean useNightVisionWhenRiding = false;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index eb578c1deb8e48c4dc0bd334118136dbc7060334..03381a67c15153162f70dc7681e06b4a7378ae9d 100644
|
||||
index 5b2fcfac84f13ac2321676e484372597e8c665d0..fec91a0e13e861d05b566891e4809644e6dd1909 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -423,10 +423,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -424,10 +424,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
@Override
|
||||
public void setPlayerListName(String name) {
|
||||
@@ -240,7 +240,7 @@ index eb578c1deb8e48c4dc0bd334118136dbc7060334..03381a67c15153162f70dc7681e06b4a
|
||||
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
|
||||
if (player.getBukkitEntity().canSee(this)) {
|
||||
player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
|
||||
@@ -2530,4 +2535,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2544,4 +2549,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
return this.spigot;
|
||||
}
|
||||
// Spigot end
|
||||
|
||||
Reference in New Issue
Block a user