PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Handle objective value changes. Although the client *shouldn't* be using this for any sort of keying, it may indeed be. Closes #1116 awaiting testing.

Browse Source
This commit is contained in:
md_5 2014-07-22 20:24:15 +10:00
parent c42d3a375f
commit 1b18e64fb2
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/net/md_5/bungee/api/score/Objective.java
View File

@ -1,11 +1,13 @@
package net.md_5.bungee.api.score;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* Represents an objective entry.
*/
@Data
@AllArgsConstructor
public class Objective
{
@ -16,7 +18,7 @@ public class Objective
/**
* Value of the objective.
*/
private final String value;
private String value;
/**
* Type; integer or hearts
*/

5
api/src/main/java/net/md_5/bungee/api/score/Scoreboard.java
View File

@ -74,6 +74,11 @@ public class Scoreboard
return teams.get( name );
}
public Objective getObjective(String name)
{
return objectives.get( name );
}
public void removeObjective(String objectiveName)
{
objectives.remove( objectiveName );

6
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -119,7 +119,11 @@ public class DownstreamBridge extends PacketHandler
serverScoreboard.removeObjective( objective.getName() );
break;
case 2:
// TODO: Handle this if we ever make an API
Objective oldObjective = serverScoreboard.getObjective( objective.getName() );
if ( oldObjective != null )
{
oldObjective.setValue( objective.getValue() );
}
break;
default:
throw new IllegalArgumentException( "Unknown objective action: " + objective.getAction() );