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

Add default kick msg component (#6886)

Browse source
This commit is contained in:
Jake Potrebic 2022-05-31 23:20:12 -07:00 • committed by GitHub
parent 3f7111d4e1
commit 78e6431008
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 182 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/server/0179-Player.setPlayerProfile-API.patch
View file

@ -24,7 +24,7 @@ index d3462cdc5eee37cedbff80f35d5b9c51e8dcd1da..5ebc450432805d52457b9f8ff1e2b198
playerName = gameProfile.getName();
uniqueId = gameProfile.getId();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 698a290a50a51d4e4c5b0282a300f130a9fe87e1..18e1907551978b541c82a07cdc30fd254484812f 100644
index 19e8ec4baf0967693121b2e3443d436f85f518ec..9ab4897d5d0b25fbdcb4a9889b7e73acd993a786 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -77,6 +77,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
@ -47,7 +47,7 @@ index 698a290a50a51d4e4c5b0282a300f130a9fe87e1..18e1907551978b541c82a07cdc30fd25
@Override
public InetSocketAddress getAddress() {
if (this.getHandle().connection == null) return null;
@@ -1476,8 +1472,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1482,8 +1478,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.hiddenEntities.put(entity.getUniqueId(), hidingPlugins);
// Remove this entity from the hidden player's EntityTrackerEntry
@ -64,7 +64,7 @@ index 698a290a50a51d4e4c5b0282a300f130a9fe87e1..18e1907551978b541c82a07cdc30fd25
ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
if (entry != null) {
entry.removePlayer(this.getHandle());
@@ -1490,8 +1493,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1496,8 +1499,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, otherPlayer));
}
}
@ -73,7 +73,7 @@ index 698a290a50a51d4e4c5b0282a300f130a9fe87e1..18e1907551978b541c82a07cdc30fd25
}
@Override
@@ -1528,8 +1529,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1534,8 +1535,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
this.hiddenEntities.remove(entity.getUniqueId());
@ -90,7 +90,7 @@ index 698a290a50a51d4e4c5b0282a300f130a9fe87e1..18e1907551978b541c82a07cdc30fd25
if (other instanceof ServerPlayer) {
ServerPlayer otherPlayer = (ServerPlayer) other;
@@ -1540,9 +1548,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1546,9 +1554,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
entry.updatePlayer(this.getHandle());
}