Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Revert team creation for player collision setting

Browse Source 
Needs more work, have redone it locally but its not quite ready for
prime time.
This commit is contained in:
Zach Brown 2016-08-31 19:22:43 -05:00
parent 0ccbb356f1
commit 2df56fa35b
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Spigot-Server-Patches/Configurable-Player-Collision.patch
View File

@ -31,22 +31,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
packetdataserializer.writeByte(this.g); 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -0,0 +0,0 @@ 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();
-- --