MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make this permissive enough for FeatherBoard

Browse Source
This commit is contained in:
Andrew Steinborn
2018-07-30 18:38:18 -04:00
parent 2d4d9e42b5
commit 9b59587e58
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
View File

@@ -225,8 +225,6 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
} }
public void handleServerScoreboardPacket(MinecraftPacket packet) { public void handleServerScoreboardPacket(MinecraftPacket packet) {
logger.info("Server scoreboard packet: {}", packet);
if (packet instanceof ScoreboardDisplay) { if (packet instanceof ScoreboardDisplay) {
ScoreboardDisplay sd = (ScoreboardDisplay) packet; ScoreboardDisplay sd = (ScoreboardDisplay) packet;
serverScoreboard.setPosition(sd.getPosition()); serverScoreboard.setPosition(sd.getPosition());
@@ -278,7 +276,6 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
} }
private void clearServerScoreboard() { private void clearServerScoreboard() {
logger.info("Scoreboard prior to cleaning: {}", serverScoreboard);
for (Objective objective : serverScoreboard.getObjectives().values()) { for (Objective objective : serverScoreboard.getObjectives().values()) {
for (Score score : objective.getScores().values()) { for (Score score : objective.getScores().values()) {
ScoreboardSetScore sss = new ScoreboardSetScore(); ScoreboardSetScore sss = new ScoreboardSetScore();

4
src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardObjective.java
View File

@@ -58,8 +58,8 @@ public class ScoreboardObjective implements MinecraftPacket {
this.id = ProtocolUtils.readString(buf, 16); this.id = ProtocolUtils.readString(buf, 16);
this.mode = buf.readByte(); this.mode = buf.readByte();
if (this.mode != 1) { if (this.mode != 1) {
this.displayName = ProtocolUtils.readString(buf, 32); this.displayName = ProtocolUtils.readString(buf);
this.type = ProtocolUtils.readString(buf, 16); this.type = ProtocolUtils.readString(buf);
} }
} }

6
src/main/java/com/velocitypowered/proxy/protocol/packets/ScoreboardTeam.java
View File

@@ -125,9 +125,9 @@ public class ScoreboardTeam implements MinecraftPacket {
switch (mode) { switch (mode) {
case 0: // create case 0: // create
case 2: // update case 2: // update
this.displayName = ProtocolUtils.readString(buf, 32); this.displayName = ProtocolUtils.readString(buf);
this.prefix = ProtocolUtils.readString(buf, 16); this.prefix = ProtocolUtils.readString(buf);
this.suffix = ProtocolUtils.readString(buf, 16); this.suffix = ProtocolUtils.readString(buf);
this.flags = buf.readByte(); this.flags = buf.readByte();
this.nameTagVisibility = ProtocolUtils.readString(buf, 32); this.nameTagVisibility = ProtocolUtils.readString(buf, 32);
this.collisionRule = ProtocolUtils.readString(buf, 32); this.collisionRule = ProtocolUtils.readString(buf, 32);