SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Send Bukkit scoreboards as well as vanilla boards

Quellcode durchsuchen 
Fixes GH-384
Dieser Commit ist enthalten in:
Zach Brown 2016-08-04 19:46:35 -05:00
Ursprung c5f0256084
Commit 9f95fbcd24
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: CC9DA35FC5450B76
1 geänderte Dateien mit 1 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

3
Spigot-Server-Patches/0127-Configurable-Player-Collision.patch
Datei anzeigen

@ -35,7 +35,7 @@ diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/
index 91e52f9..f133b32 100644 index 91e52f9..f133b32 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/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) { public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
HashSet hashset = Sets.newHashSet(); HashSet hashset = Sets.newHashSet();
Iterator iterator = scoreboardserver.getTeams().iterator(); Iterator iterator = scoreboardserver.getTeams().iterator();
@ -44,7 +44,6 @@ index 91e52f9..f133b32 100644
+ if (!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions && !iterator.hasNext()) { + if (!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions && !iterator.hasNext()) {
+ String teamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + entityplayer.getWorld().random.nextInt(), 16); + String teamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + entityplayer.getWorld().random.nextInt(), 16);
+ entityplayer.playerConnection.sendPacket(new PacketPlayOutScoreboardTeam(new ScoreboardTeam(scoreboardserver, teamName), 0)); + entityplayer.playerConnection.sendPacket(new PacketPlayOutScoreboardTeam(new ScoreboardTeam(scoreboardserver, teamName), 0));
+ return;
+ } + }
+ // Paper end + // Paper end