From 9f95fbcd24283b81aad92283d4514f04b2ac4f0b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 4 Aug 2016 19:46:35 -0500 Subject: [PATCH] Send Bukkit scoreboards as well as vanilla boards Fixes GH-384 --- Spigot-Server-Patches/0127-Configurable-Player-Collision.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch index 92a2de47a4..5af7436dff 100644 --- a/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch @@ -35,7 +35,7 @@ diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/ index 91e52f9..f133b32 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -241,6 +241,14 @@ public abstract class PlayerList { +@@ -241,6 +241,13 @@ public abstract class PlayerList { public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) { HashSet hashset = Sets.newHashSet(); Iterator iterator = scoreboardserver.getTeams().iterator(); @@ -44,7 +44,6 @@ index 91e52f9..f133b32 100644 + if (!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions && !iterator.hasNext()) { + String teamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + entityplayer.getWorld().random.nextInt(), 16); + entityplayer.playerConnection.sendPacket(new PacketPlayOutScoreboardTeam(new ScoreboardTeam(scoreboardserver, teamName), 0)); -+ return; + } + // Paper end