GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix instances of invisible/flickering scoreboards

Browse source
This commit is contained in:
Camotoy 2021-10-22 23:31:40 -04:00
parent a7aa255784
commit 9a159bf8be
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
connector/src/main/java/org/geysermc/connector/scoreboard/Objective.java
View file

@ -150,20 +150,6 @@ public final class Objective {
updateType = UpdateType.REMOVE;
}
public ScoreboardPosition getPositionCategory() {
return switch (displaySlot) {
case PLAYER_LIST -> ScoreboardPosition.PLAYER_LIST;
case BELOW_NAME -> ScoreboardPosition.BELOW_NAME;
default -> ScoreboardPosition.SIDEBAR;
};
}
public boolean hasTeamColor() {
return displaySlot != ScoreboardPosition.PLAYER_LIST &&
displaySlot != ScoreboardPosition.BELOW_NAME &&
displaySlot != ScoreboardPosition.SIDEBAR;
}
public TeamColor getTeamColor() {
return switch (displaySlot) {
case SIDEBAR_TEAM_RED -> TeamColor.RED;

12
connector/src/main/java/org/geysermc/connector/scoreboard/Scoreboard.java
View file

@ -104,7 +104,7 @@ public final class Scoreboard {
Objective storedObjective = objectiveSlots.get(displaySlot);
if (storedObjective != null && storedObjective != objective) {
objective.pendingRemove();
storedObjective.pendingRemove();
}
objectiveSlots.put(displaySlot, objective);
@ -166,6 +166,12 @@ public final class Scoreboard {
correctSidebar = objectiveSlots.get(ScoreboardPosition.SIDEBAR);
}
for (Objective objective : removedObjectives) {
// Deletion must be handled before the active objectives are handled - otherwise if a scoreboard display is changed before the current
// scoreboard is removed, the client can crash
deleteObjective(objective, true);
}
handleObjective(objectiveSlots.get(ScoreboardPosition.PLAYER_LIST), addScores, removeScores);
handleObjective(correctSidebar, addScores, removeScores);
handleObjective(objectiveSlots.get(ScoreboardPosition.BELOW_NAME), addScores, removeScores);
@ -194,10 +200,6 @@ public final class Scoreboard {
session.sendUpstreamPacket(setScorePacket);
}
for (Objective objective : removedObjectives) {
deleteObjective(objective, true);
}
lastAddScoreCount = addScores.size();
lastRemoveScoreCount = removeScores.size();
}