mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream update

Browse source
This commit is contained in:
Bjarne Koll 2024-10-24 19:29:35 +02:00
parent fc05430719
commit 9047541397
No known key found for this signature in database
GPG key ID: 27F6CCCF55D2EE62
174 changed files with 468 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/server/0176-Player.setPlayerProfile-API.patch
View file

@ -64,10 +64,10 @@ index 818df09e9245b5d89b4180b1eaa51470b7539341..f6b2ca92fd3510a76cbf56d0ea55aa6c
public Server getServer() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 18c0f0550cd6b41fa394e36ee5eb9ee48138dc0b..356681047e34b577f51a4f90ebc8892cb1e6eaa8 100644
index d98c0b9faa4ec97ef251d397456458668c911012..862001f88b4613cb420bf8b8ca1471f41729ad0f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -250,11 +250,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -254,11 +254,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.server.getPlayer(this.getUniqueId()) != null;
}
@ -79,7 +79,7 @@ index 18c0f0550cd6b41fa394e36ee5eb9ee48138dc0b..356681047e34b577f51a4f90ebc8892c
@Override
public InetSocketAddress getAddress() {
if (this.getHandle().connection.protocol() == null) return null;
@@ -1805,8 +1800,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1819,8 +1814,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private void untrackAndHideEntity(org.bukkit.entity.Entity entity) {
// Remove this entity from the hidden player's EntityTrackerEntry
@ -96,7 +96,7 @@ index 18c0f0550cd6b41fa394e36ee5eb9ee48138dc0b..356681047e34b577f51a4f90ebc8892c
ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
if (entry != null) {
entry.removePlayer(this.getHandle());
@@ -1819,8 +1821,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1833,8 +1835,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
}
}
@ -105,7 +105,7 @@ index 18c0f0550cd6b41fa394e36ee5eb9ee48138dc0b..356681047e34b577f51a4f90ebc8892c
}
void resetAndHideEntity(org.bukkit.entity.Entity entity) {
@@ -1885,12 +1885,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1899,12 +1899,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
private void trackAndShowEntity(org.bukkit.entity.Entity entity) {
@ -131,7 +131,7 @@ index 18c0f0550cd6b41fa394e36ee5eb9ee48138dc0b..356681047e34b577f51a4f90ebc8892c
}
ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
@@ -1900,6 +1913,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1914,6 +1927,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
}
@ -171,7 +171,7 @@ index 18c0f0550cd6b41fa394e36ee5eb9ee48138dc0b..356681047e34b577f51a4f90ebc8892c
void resetAndShowEntity(org.bukkit.entity.Entity entity) {
// SPIGOT-7312: Can't show/hide self
@@ -1911,6 +1957,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1925,6 +1971,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.trackAndShowEntity(entity);
}
}