From 8eb7f073d6792bf48c6ff9b4462ae43e6960e526 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 31 Aug 2016 19:22:43 -0500 Subject: [PATCH] Revert team creation for player collision setting Needs more work, have redone it locally but its not quite ready for prime time. --- .../0125-Configurable-Player-Collision.patch | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch index 3853c8fd6..418199077 100644 --- a/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From d390a50649cfe946a9c281fd103e1ba6f5857a82 Mon Sep 17 00:00:00 2001 +From be7abd3e82e2f0c81e607b6ea382fd6fd21dd897 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision @@ -31,24 +31,6 @@ index d8ec504..eb45d3c 100644 packetdataserializer.writeByte(this.g); } -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a41bc5f..9262ab8 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -241,6 +241,13 @@ public abstract class PlayerList { - public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) { - HashSet hashset = Sets.newHashSet(); - Iterator iterator = scoreboardserver.getTeams().iterator(); -+ -+ // Paper start - Send a fake team to the client to initialize collision rule if no others exist -+ 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)); -+ } -+ // Paper end - - while (iterator.hasNext()) { - ScoreboardTeam scoreboardteam = (ScoreboardTeam) iterator.next(); -- -2.9.2.windows.1 +2.9.3