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

Some work on the ItemMend events

Browse source
This commit is contained in:
Bjarne Koll 2024-06-14 16:01:00 +02:00
parent 69d1d0a4f4
commit 547f09dfa0
No known key found for this signature in database
GPG key ID: 27F6CCCF55D2EE62
40 changed files with 91 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/server/0177-Player.setPlayerProfile-API.patch
View file

@ -77,7 +77,7 @@ index 818df09e9245b5d89b4180b1eaa51470b7539341..461656e1cb095243bfe7a9ee2906e5b0
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 44529bfbf7ee1b03bc1f35c0f536fa36dd72b5d4..4220223a7282ab5588234497ef2d34128107676a 100644
index aaef5693b044141d2aa8108b74b240903c64e6e6..a6567aa9a3ec9dd17689e907131e5cca05da7c9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -249,11 +249,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -92,7 +92,7 @@ index 44529bfbf7ee1b03bc1f35c0f536fa36dd72b5d4..4220223a7282ab5588234497ef2d3412
@Override
public InetSocketAddress getAddress() {
if (this.getHandle().connection.protocol() == null) return null;
@@ -1788,8 +1783,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1791,8 +1786,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
@ -109,7 +109,7 @@ index 44529bfbf7ee1b03bc1f35c0f536fa36dd72b5d4..4220223a7282ab5588234497ef2d3412
ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
if (entry != null) {
entry.removePlayer(this.getHandle());
@@ -1802,8 +1804,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1805,8 +1807,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
}
}
@ -118,7 +118,7 @@ index 44529bfbf7ee1b03bc1f35c0f536fa36dd72b5d4..4220223a7282ab5588234497ef2d3412
}
void resetAndHideEntity(org.bukkit.entity.Entity entity) {
@@ -1868,12 +1868,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1871,12 +1871,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
private void trackAndShowEntity(org.bukkit.entity.Entity entity) {
@ -144,7 +144,7 @@ index 44529bfbf7ee1b03bc1f35c0f536fa36dd72b5d4..4220223a7282ab5588234497ef2d3412
}
ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
@@ -1883,6 +1896,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1886,6 +1899,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
}
@ -184,7 +184,7 @@ index 44529bfbf7ee1b03bc1f35c0f536fa36dd72b5d4..4220223a7282ab5588234497ef2d3412
void resetAndShowEntity(org.bukkit.entity.Entity entity) {
// SPIGOT-7312: Can't show/hide self
@@ -1894,6 +1940,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1897,6 +1943,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.trackAndShowEntity(entity);
}
}