Apple
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Scoreboard: Fix various issues (#1286) 

* Scoreboard: update score on UpdateType.ADD

* Actually fix

* Readd the Objective when a score changes

It looks like Objectives only update when you Remove the Objective and add it back using the SetDisplayObjective. This is hopefully a hotfix, but I think that there is no better way.

* Explain score tracking

Co-authored-by: Tim203 <mctim203@gmail.com>
This commit is contained in:
Camotoy 2020-09-21 23:55:13 -04:00 committed by GitHub
parent 2db1d16f5c
commit 02aeddbadd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/scoreboard/Objective.java
View File

@ -83,7 +83,7 @@ public class Objective {
public void setScore(String id, int score) { public void setScore(String id, int score) {
if (scores.containsKey(id)) { if (scores.containsKey(id)) {
scores.get(id).setScore(score).setUpdateType(UpdateType.ADD); scores.get(id).setScore(score);
return; return;
} }
registerScore(id, score); registerScore(id, score);

13
connector/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java
View File

@ -26,7 +26,6 @@
package org.geysermc.connector.scoreboard; package org.geysermc.connector.scoreboard;
import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition; import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition;
import com.nukkitx.protocol.bedrock.BedrockPacket;
import com.nukkitx.protocol.bedrock.data.ScoreInfo; import com.nukkitx.protocol.bedrock.data.ScoreInfo;
import com.nukkitx.protocol.bedrock.packet.RemoveObjectivePacket; import com.nukkitx.protocol.bedrock.packet.RemoveObjectivePacket;
import com.nukkitx.protocol.bedrock.packet.SetDisplayObjectivePacket; import com.nukkitx.protocol.bedrock.packet.SetDisplayObjectivePacket;
@ -153,6 +152,10 @@ public class Scoreboard {
boolean globalAdd = objective.getUpdateType() == ADD; boolean globalAdd = objective.getUpdateType() == ADD;
boolean globalRemove = objective.getUpdateType() == REMOVE; boolean globalRemove = objective.getUpdateType() == REMOVE;
// Track if any scores changed
// Used to delete and resend scoreboard objectives; otherwise they won't update on Bedrock
boolean scoreChanged = false;
for (Score score : objective.getScores().values()) { for (Score score : objective.getScores().values()) {
Team team = score.getTeam(); Team team = score.getTeam();
@ -187,6 +190,10 @@ public class Scoreboard {
if (remove) { if (remove) {
removeScores.add(score.getCachedInfo()); removeScores.add(score.getCachedInfo());
} }
if (add || remove) {
scoreChanged = true;
}
// score is pending to be updated, so we use the current score as the old score // score is pending to be updated, so we use the current score as the old score
score.setOldScore(score.getScore()); score.setOldScore(score.getScore());
@ -198,7 +205,7 @@ public class Scoreboard {
score.setUpdateType(NOTHING); score.setUpdateType(NOTHING);
} }
if (globalRemove || globalUpdate) { if (globalRemove || globalUpdate || scoreChanged) {
RemoveObjectivePacket removeObjectivePacket = new RemoveObjectivePacket(); RemoveObjectivePacket removeObjectivePacket = new RemoveObjectivePacket();
removeObjectivePacket.setObjectiveId(objective.getObjectiveName()); removeObjectivePacket.setObjectiveId(objective.getObjectiveName());
session.sendUpstreamPacket(removeObjectivePacket); session.sendUpstreamPacket(removeObjectivePacket);
@ -208,7 +215,7 @@ public class Scoreboard {
} }
} }
if (globalAdd || globalUpdate) { if (globalAdd || globalUpdate || scoreChanged) {
SetDisplayObjectivePacket displayObjectivePacket = new SetDisplayObjectivePacket(); SetDisplayObjectivePacket displayObjectivePacket = new SetDisplayObjectivePacket();
displayObjectivePacket.setObjectiveId(objective.getObjectiveName()); displayObjectivePacket.setObjectiveId(objective.getObjectiveName());
displayObjectivePacket.setDisplayName(objective.getDisplayName()); displayObjectivePacket.setDisplayName(objective.getDisplayName());