fixed update player list. (#1170)

CloudburstMC · Oct 22, 2016 · 6a8eac3 · 6a8eac3
1 parent 09d782e
commit 6a8eac3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/server/src/main/java/cn/nukkit/Player.java b/server/src/main/java/cn/nukkit/Player.java
@@ -680,7 +680,7 @@ protected void doFirstSpawn() {
  this.getAdventureSettings().update();
 
  this.server.updatePlayerListData(this.getUniqueId(), this.getId(), this.getDisplayName(), this.getSkin());
- this.server.sendFullPlayerListData(this, false);
+ this.server.sendFullPlayerListData(this);
 
  this.sendPotionEffects(this);
  this.sendData(this);
@@ -1639,7 +1639,7 @@ protected void processLogin() {
  return;
  }
 
- this.server.addOnlinePlayer(this, false);
+ this.server.addOnlinePlayer(this);
  this.loggedIn = true;
 
  if (this.isCreative()) {

diff --git a/server/src/main/java/cn/nukkit/Server.java b/server/src/main/java/cn/nukkit/Server.java
@@ -813,15 +813,8 @@ public void addPlayer(String identifier, Player player) {
  }
 
  public void addOnlinePlayer(Player player) {
- this.addOnlinePlayer(player, true);
- }
-
- public void addOnlinePlayer(Player player, boolean update) {
  this.playerList.put(player.getUniqueId(), player);
-
- if (update) {
- this.updatePlayerListData(player.getUniqueId(), player.getId(), player.getDisplayName(), player.getSkin());
- }
+ this.updatePlayerListData(player.getUniqueId(), player.getId(), player.getDisplayName(), player.getSkin());
  }
 
  public void removeOnlinePlayer(Player player) {
@@ -867,22 +860,17 @@ public void removePlayerListData(UUID uuid, Collection<Player> players) {
  }
 
  public void sendFullPlayerListData(Player player) {
- this.sendFullPlayerListData(player, false);
- }
-
- public void sendFullPlayerListData(Player player, boolean self) {
  PlayerListPacket pk = new PlayerListPacket();
  pk.type = PlayerListPacket.TYPE_ADD;
- List<PlayerListPacket.Entry> entries = new ArrayList<>();
- for (Player p : this.playerList.values()) {
- if (!self && p == player) {
- continue;
- }
-
- entries.add(new PlayerListPacket.Entry(p.getUniqueId(), p.getId(), p.getDisplayName(), p.getSkin()));
- }
-
- pk.entries = entries.stream().toArray(PlayerListPacket.Entry[]::new);
+ pk.entries = this.playerList
+ .values()
+ .stream()
+ .map(p -> new PlayerListPacket.Entry(
+ p.getUniqueId(),
+ p.getId(),
+ p.getDisplayName(),
+ p.getSkin()))
+ .toArray(PlayerListPacket.Entry[]::new);
 
  player.dataPacket(pk);
  }