Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 10:21:18 +02:00
Code Issues Projects Releases Wiki Activity

Send complete metadata update to joining players

Browse Source
This commit is contained in:
md_5 2018-01-08 19:48:32 +11:00
parent 4119224efe
commit 1dced6a2c5
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
nms-patches/PlayerList.patch
View File

@ -204,7 +204,7 @@
if (advancementdataplayer != null) { if (advancementdataplayer != null) {
advancementdataplayer.c(); advancementdataplayer.c();
@@ -267,28 +319,73 @@ @@ -267,28 +319,75 @@
} }
@ -253,6 +253,8 @@
- worldserver.addEntity(entityplayer); - worldserver.addEntity(entityplayer);
- this.a(entityplayer, (WorldServer) null); - this.a(entityplayer, (WorldServer) null);
+ entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityMetadata(entityplayer.getId(), entityplayer.datawatcher, true)); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
+
+ // CraftBukkit start - Only add if the player wasn't moved in the event + // CraftBukkit start - Only add if the player wasn't moved in the event
+ if (entityplayer.world == worldserver && !worldserver.players.contains(entityplayer)) { + if (entityplayer.world == worldserver && !worldserver.players.contains(entityplayer)) {
+ worldserver.addEntity(entityplayer); + worldserver.addEntity(entityplayer);
@ -284,7 +286,7 @@
this.savePlayerFile(entityplayer); this.savePlayerFile(entityplayer);
if (entityplayer.isPassenger()) { if (entityplayer.isPassenger()) {
Entity entity = entityplayer.getVehicle(); Entity entity = entityplayer.getVehicle();
@@ -318,17 +415,67 @@ @@ -318,17 +417,67 @@
if (entityplayer1 == entityplayer) { if (entityplayer1 == entityplayer) {
this.j.remove(uuid); this.j.remove(uuid);
@ -294,9 +296,8 @@
+ // this.o.remove(uuid); + // this.o.remove(uuid);
+ // this.p.remove(uuid); + // this.p.remove(uuid);
+ // CraftBukkit end + // CraftBukkit end
} + }
+
- this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[] { entityplayer}));
+ // CraftBukkit start + // CraftBukkit start
+ // this.sendAll(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[] { entityplayer})); + // this.sendAll(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[] { entityplayer}));
+ PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entityplayer); + PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entityplayer);
@ -308,11 +309,12 @@
+ } else { + } else {
+ entityplayer2.getBukkitEntity().removeDisconnectingPlayer(entityplayer.getBukkitEntity()); + entityplayer2.getBukkitEntity().removeDisconnectingPlayer(entityplayer.getBukkitEntity());
+ } + }
+ } }
+ // This removes the scoreboard (and player reference) for the specific player in the manager + // This removes the scoreboard (and player reference) for the specific player in the manager
+ cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity()); + cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
+ // CraftBukkit end + // CraftBukkit end
+
- this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[] { entityplayer}));
+ ChunkIOExecutor.adjustPoolSize(this.getPlayerCount()); // CraftBukkit + ChunkIOExecutor.adjustPoolSize(this.getPlayerCount()); // CraftBukkit
+ +
+ return playerQuitEvent.getQuitMessage(); // CraftBukkit + return playerQuitEvent.getQuitMessage(); // CraftBukkit
@ -357,7 +359,7 @@
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile); GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
s = "You are banned from this server!\nReason: " + gameprofilebanentry.getReason(); s = "You are banned from this server!\nReason: " + gameprofilebanentry.getReason();
@@ -336,10 +483,12 @@ @@ -336,10 +485,12 @@
s = s + "\nYour ban will be removed on " + PlayerList.g.format(gameprofilebanentry.getExpires()); s = s + "\nYour ban will be removed on " + PlayerList.g.format(gameprofilebanentry.getExpires());
} }
@ -373,7 +375,7 @@
IpBanEntry ipbanentry = this.l.get(socketaddress); IpBanEntry ipbanentry = this.l.get(socketaddress);
s = "Your IP address is banned from this server!\nReason: " + ipbanentry.getReason(); s = "Your IP address is banned from this server!\nReason: " + ipbanentry.getReason();
@@ -347,13 +496,25 @@ @@ -347,13 +498,25 @@
s = s + "\nYour ban will be removed on " + PlayerList.g.format(ipbanentry.getExpires()); s = s + "\nYour ban will be removed on " + PlayerList.g.format(ipbanentry.getExpires());
} }
@ -402,7 +404,7 @@
UUID uuid = EntityHuman.a(gameprofile); UUID uuid = EntityHuman.a(gameprofile);
ArrayList arraylist = Lists.newArrayList(); ArrayList arraylist = Lists.newArrayList();
@@ -388,17 +549,27 @@ @@ -388,17 +551,27 @@
} }
return new EntityPlayer(this.server, this.server.getWorldServer(0), gameprofile, (PlayerInteractManager) object); return new EntityPlayer(this.server, this.server.getWorldServer(0), gameprofile, (PlayerInteractManager) object);
@ -431,7 +433,7 @@
entityplayer.dimension = i; entityplayer.dimension = i;
Object object; Object object;
@@ -409,6 +580,11 @@ @@ -409,6 +582,11 @@
} }
EntityPlayer entityplayer1 = new EntityPlayer(this.server, this.server.getWorldServer(entityplayer.dimension), entityplayer.getProfile(), (PlayerInteractManager) object); EntityPlayer entityplayer1 = new EntityPlayer(this.server, this.server.getWorldServer(entityplayer.dimension), entityplayer.getProfile(), (PlayerInteractManager) object);
@ -443,7 +445,7 @@
entityplayer1.playerConnection = entityplayer.playerConnection; entityplayer1.playerConnection = entityplayer.playerConnection;
entityplayer1.copyFrom(entityplayer, flag); entityplayer1.copyFrom(entityplayer, flag);
@@ -423,43 +599,163 @@ @@ -423,43 +601,163 @@
entityplayer1.addScoreboardTag(s); entityplayer1.addScoreboardTag(s);
} }
@ -624,7 +626,7 @@
public void f(EntityPlayer entityplayer) { public void f(EntityPlayer entityplayer) {
GameProfile gameprofile = entityplayer.getProfile(); GameProfile gameprofile = entityplayer.getProfile();
int i = this.isOp(gameprofile) ? this.operators.a(gameprofile) : 0; int i = this.isOp(gameprofile) ? this.operators.a(gameprofile) : 0;
@@ -498,12 +794,111 @@ @@ -498,12 +796,111 @@
} }
public void changeWorld(Entity entity, int i, WorldServer worldserver, WorldServer worldserver1) { public void changeWorld(Entity entity, int i, WorldServer worldserver, WorldServer worldserver1) {
@ -736,7 +738,7 @@
if (entity.dimension == -1) { if (entity.dimension == -1) {
d0 = MathHelper.a(d0 / 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D); d0 = MathHelper.a(d0 / 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
d1 = MathHelper.a(d1 / 8.0D, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D); d1 = MathHelper.a(d1 / 8.0D, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D);
@@ -522,6 +917,8 @@ @@ -522,6 +919,8 @@
BlockPosition blockposition; BlockPosition blockposition;
if (i == 1) { if (i == 1) {
@ -745,7 +747,7 @@
blockposition = worldserver1.getSpawn(); blockposition = worldserver1.getSpawn();
} else { } else {
blockposition = worldserver1.getDimensionSpawn(); blockposition = worldserver1.getDimensionSpawn();
@@ -535,16 +932,27 @@ @@ -535,16 +934,27 @@
worldserver.entityJoinedWorld(entity, false); worldserver.entityJoinedWorld(entity, false);
} }
} }
@ -776,7 +778,7 @@
worldserver1.entityJoinedWorld(entity, false); worldserver1.entityJoinedWorld(entity, false);
} }
@@ -552,11 +960,23 @@ @@ -552,11 +962,23 @@
} }
entity.spawnIn(worldserver1); entity.spawnIn(worldserver1);
@ -801,7 +803,7 @@
this.v = 0; this.v = 0;
} }
@@ -569,6 +989,25 @@ @@ -569,6 +991,25 @@
} }
@ -827,7 +829,7 @@
public void a(Packet<?> packet, int i) { public void a(Packet<?> packet, int i) {
for (int j = 0; j < this.players.size(); ++j) { for (int j = 0; j < this.players.size(); ++j) {
EntityPlayer entityplayer = (EntityPlayer) this.players.get(j); EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
@@ -667,11 +1106,23 @@ @@ -667,11 +1108,23 @@
this.operators.add(new OpListEntry(gameprofile, this.server.q(), this.operators.b(gameprofile))); this.operators.add(new OpListEntry(gameprofile, this.server.q(), this.operators.b(gameprofile)));
this.b(this.a(gameprofile.getId()), i); this.b(this.a(gameprofile.getId()), i);
@ -851,7 +853,7 @@
} }
private void b(EntityPlayer entityplayer, int i) { private void b(EntityPlayer entityplayer, int i) {
@@ -696,7 +1147,7 @@ @@ -696,7 +1149,7 @@
} }
public boolean isOp(GameProfile gameprofile) { public boolean isOp(GameProfile gameprofile) {
@ -860,7 +862,7 @@
} }
@Nullable @Nullable
@@ -720,6 +1171,12 @@ @@ -720,6 +1173,12 @@
for (int j = 0; j < this.players.size(); ++j) { for (int j = 0; j < this.players.size(); ++j) {
EntityPlayer entityplayer = (EntityPlayer) this.players.get(j); EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
@ -873,7 +875,7 @@
if (entityplayer != entityhuman && entityplayer.dimension == i) { if (entityplayer != entityhuman && entityplayer.dimension == i) {
double d4 = d0 - entityplayer.locX; double d4 = d0 - entityplayer.locX;
double d5 = d1 - entityplayer.locY; double d5 = d1 - entityplayer.locY;
@@ -767,7 +1224,7 @@ @@ -767,7 +1226,7 @@
public void reloadWhitelist() {} public void reloadWhitelist() {}
public void b(EntityPlayer entityplayer, WorldServer worldserver) { public void b(EntityPlayer entityplayer, WorldServer worldserver) {
@ -882,7 +884,7 @@
entityplayer.playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE)); entityplayer.playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean("doDaylightCycle"))); entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean("doDaylightCycle")));
@@ -775,16 +1232,21 @@ @@ -775,16 +1234,21 @@
entityplayer.playerConnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition)); entityplayer.playerConnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition));
if (worldserver.isRaining()) { if (worldserver.isRaining()) {
@ -908,7 +910,7 @@
entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex)); entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
} }
@@ -797,7 +1259,7 @@ @@ -797,7 +1261,7 @@
} }
public String[] getSeenPlayers() { public String[] getSeenPlayers() {
@ -917,7 +919,7 @@
} }
public boolean getHasWhitelist() { public boolean getHasWhitelist() {
@@ -846,26 +1308,39 @@ @@ -846,26 +1310,39 @@
} }
public void u() { public void u() {
@ -962,7 +964,7 @@
if (serverstatisticmanager == null) { if (serverstatisticmanager == null) {
File file = new File(this.server.getWorldServer(0).getDataManager().getDirectory(), "stats"); File file = new File(this.server.getWorldServer(0).getDataManager().getDirectory(), "stats");
@@ -881,7 +1356,7 @@ @@ -881,7 +1358,7 @@
serverstatisticmanager = new ServerStatisticManager(this.server, file1); serverstatisticmanager = new ServerStatisticManager(this.server, file1);
serverstatisticmanager.a(); serverstatisticmanager.a();
@ -971,7 +973,7 @@
} }
return serverstatisticmanager; return serverstatisticmanager;
@@ -889,14 +1364,14 @@ @@ -889,14 +1366,14 @@
public AdvancementDataPlayer h(EntityPlayer entityplayer) { public AdvancementDataPlayer h(EntityPlayer entityplayer) {
UUID uuid = entityplayer.getUniqueID(); UUID uuid = entityplayer.getUniqueID();
@ -988,7 +990,7 @@
} }
advancementdataplayer.a(entityplayer); advancementdataplayer.a(entityplayer);
@@ -909,8 +1384,10 @@ @@ -909,8 +1386,10 @@
WorldServer[] aworldserver = this.server.worldServer; WorldServer[] aworldserver = this.server.worldServer;
int j = aworldserver.length; int j = aworldserver.length;
@ -1001,7 +1003,7 @@
if (worldserver != null) { if (worldserver != null) {
worldserver.getPlayerChunkMap().a(i); worldserver.getPlayerChunkMap().a(i);
@@ -934,13 +1411,20 @@ @@ -934,13 +1413,20 @@
} }
public void reload() { public void reload() {