Scoreboard implementation

Server/Plugins/APIDump/APIDesc.lua

@@ -9086,7 +9086,7 @@ a_Player:OpenWindow(Window);
 		cObjective =
 		{
 			Desc = [[
-				This class represents a single scoreboard objective.
+				This class represents a single scoreboard objective. Note that the term "player" is used loosely here to mean "item that the objective is tracking," to match the Vanilla minecraft documentation, but a "player" does not need to be the username of an actual player.
 			]],
 			Functions =
 			{
@@ -9095,11 +9095,11 @@ a_Player:OpenWindow(Window);
 					Params =
 					{
 						{
-							Name = "string",
+							Name = "player",
 							Type = "string",
 						},
 						{
-							Name = "number",
+							Name = "ScoreToAdd",
 							Type = "number",
 						},
 					},
@@ -9132,12 +9132,22 @@ a_Player:OpenWindow(Window);
 					},
 					Notes = "Returns the internal name of the objective.",
 				},
+				GetPlayers =
+				{
+					Returns =
+					{
+						{
+							Type = "table",
+						},
+					},
+					Notes = "Returns all of the players this objective is tracking",
+				},
 				GetScore =
 				{
 					Params =
 					{
 						{
-							Name = "string",
+							Name = "player",
 							Type = "string",
 						},
 					},
@@ -9170,18 +9180,29 @@ a_Player:OpenWindow(Window);
 					Params =
 					{
 						{
-							Name = "string",
+							Name = "player",
 							Type = "string",
 						},
 					},
 					Notes = "Reset the score of the specified player.",
 				},
+				SetAllScores =
+				{
+					Params =
+					{
+						{
+							Name = "Score",
+							Type = "number",
+						},
+					},
+					Notes = "Sets the score of every player this objective tracks to the given score",
+				},
 				SetDisplayName =
 				{
 					Params =
 					{
 						{
-							Name = "string",
+							Name = "DisplayName",
 							Type = "string",
 						},
 					},
@@ -9192,7 +9213,7 @@ a_Player:OpenWindow(Window);
 					Params =
 					{
 						{
-							Name = "string",
+							Name = "player",
 							Type = "string",
 						},
 						{
@@ -9202,16 +9223,33 @@ a_Player:OpenWindow(Window);
 					},
 					Notes = "Sets the score of the specified player.",
 				},
+				StringToType =
+				{
+					Params =
+					{
+						{
+							Name = "TypeString",
+							Type = "string",
+						},
+					},
+					Returns =
+					{
+						{
+							Type = "<unknown>",
+						},
+					},
+					Notes = "(STATIC) Converts a Vanilla minecraft objective criteria string to an internal eType.",
+				},
 				SubScore =
 				{
 					Params =
 					{
 						{
-							Name = "string",
+							Name = "player",
 							Type = "string",
 						},
 						{
-							Name = "number",
+							Name = "ScoreToSubtract",
 							Type = "number",
 						},
 					},
@@ -9224,6 +9262,23 @@ a_Player:OpenWindow(Window);
 					},
 					Notes = "Subtracts a value from the score of the specified player and returns the new value.",
 				},
+				TypeToString =
+				{
+					Params =
+					{
+						{
+							Name = "Type",
+							Type = "<unknown>",
+						},
+					},
+					Returns =
+					{
+						{
+							Type = "string",
+						},
+					},
+					Notes = "(STATIC) Converts an internal objective eType to a Vanilla minecraft objective criteria string",
+				},
 			},
 			Constants =
 			{
@@ -11551,7 +11606,7 @@ end
 						},
 						{
 							Name = "Value",
-							Type = "<unknown>",
+							Type = "number",
 						},
 					},
 					Notes = "Adds a value to all player scores of the specified objective type.",
@@ -11793,6 +11848,10 @@ end
 				{
 					Notes = "",
 				},
+				dsSidebarTeamOffset =
+				{
+					Notes = "Add this to the team color (see cTeam::GetColor()) to get the appropriate display slot ID for the sidebar of that team. Note that the team must have been assigned a valid color using SetColor().",
+				},
 			},
 		},
 		cServer =
@@ -12072,6 +12131,16 @@ local CompressedString = cStringCompression.CompressStringGZIP("DataToCompress")
 					},
 					Notes = "Returns whether players can see invisible teammates.",
 				},
+				GetColor =
+				{
+					Returns =
+					{
+						{
+							Type = "number",
+						},
+					},
+					Notes = "Returns the color ID of the team",
+				},
 				GetDisplayName =
 				{
 					Returns =
@@ -12171,6 +12240,17 @@ local CompressedString = cStringCompression.CompressStringGZIP("DataToCompress")
 					},
 					Notes = "Set whether players can see invisible teammates.",
 				},
+				SetColor =
+				{
+					Params =
+					{
+						{
+							Name = "Color",
+							Type = "number",
+						},
+					},
+					Notes = "Sets the color ID of the team (0 to 15)",
+				},
 				SetDisplayName =
 				{
 					Params =
@@ -12216,6 +12296,77 @@ local CompressedString = cStringCompression.CompressStringGZIP("DataToCompress")
 					Notes = "Sets the suffix appended to the names of the members of this team.",
 				},
 			},
+			Constants =
+			{
+				teamInvalid =
+				{
+					Notes = "Placeholder for teams which are not associated with a color.",
+				},
+				teamBlack =
+				{
+					Notes = "",
+				},
+				teamDarkBlue =
+				{
+					Notes = "",
+				},
+				teamDarkGreen =
+				{
+					Notes = "",
+				},
+				teamDarkAqua =
+				{
+					Notes = "",
+				},
+				teamDarkRed =
+				{
+					Notes = "",
+				},
+				teamDarkPurple =
+				{
+					Notes = "",
+				},
+				teamGold =
+				{
+					Notes = "",
+				},
+				teamGray =
+				{
+					Notes = "",
+				},
+				teamDarkGray =
+				{
+					Notes = "",
+				},
+				teamBlue =
+				{
+					Notes = "",
+				},
+				teamGreen =
+				{
+					Notes = "",
+				},
+				teamAqua =
+				{
+					Notes = "",
+				},
+				teamRed =
+				{
+					Notes = "",
+				},
+				teamLightPurple =
+				{
+					Notes = "",
+				},
+				teamYellow =
+				{
+					Notes = "",
+				},
+				teamWhite =
+				{
+					Notes = "",
+				},
+			},
 		},
 		cTNTEntity =
 		{

src/Bindings/ManualBindings.cpp

@@ -3053,6 +3053,30 @@ static int tolua_cLuaWindow_new_local(lua_State * tolua_S)
 
 
 
+static int tolua_cObjective_GetPlayers(lua_State * tolua_S)
+{
+	cLuaState S(tolua_S);
+	if (
+		!S.CheckParamUserType(1, "cObjective") ||
+		!S.CheckParamEnd(2)
+	)
+	{
+		return 0;
+	}
+
+	// Get the groups:
+	cObjective * Objective = reinterpret_cast<cObjective *>(tolua_tousertype(tolua_S, 1, nullptr));
+	AStringVector Players = Objective->GetPlayers();
+
+	// Push the results:
+	S.Push(Players);
+	return 1;
+}
+
+
+
+
+
 static int tolua_cRoot_GetBuildCommitID(lua_State * tolua_S)
 {
 	cLuaState L(tolua_S);
@@ -3890,6 +3914,10 @@ void cManualBindings::Bind(lua_State * tolua_S)
 			tolua_function(tolua_S, "MakeUUIDShort",              tolua_cMojangAPI_MakeUUIDShort);
 		tolua_endmodule(tolua_S);
 
+		tolua_beginmodule(tolua_S, "cObjective");
+			tolua_function(tolua_S, "GetPlayers", tolua_cObjective_GetPlayers);
+		tolua_endmodule(tolua_S);
+
 		tolua_beginmodule(tolua_S, "cPlayer");
 			tolua_function(tolua_S, "GetPermissions",    tolua_cPlayer_GetPermissions);
 			tolua_function(tolua_S, "GetRestrictions",   tolua_cPlayer_GetRestrictions);

src/ClientHandle.cpp

@@ -446,9 +446,6 @@ void cClientHandle::Authenticate(const AString & a_Name, const AString & a_UUID,
 	// Query player team
 	m_Player->UpdateTeam();
 
-	// Send scoreboard data
-	World->GetScoreBoard().SendTo(*this);
-
 	// Send statistics
 	SendStatistics(m_Player->GetStatManager());
 
@@ -2928,6 +2925,24 @@ void cClientHandle::SendDisplayObjective(const AString & a_Objective, cScoreboar
 
 
 
+void cClientHandle::SendTeam(const cTeam & a_Team, cTeam::eProtocolAction a_Mode)
+{
+	m_Protocol->SendTeam(a_Team, a_Mode);
+}
+
+
+
+
+
+void cClientHandle::SendTeamChangeMembership(const AString & a_TeamName, bool a_IsAdding, const std::set<AString> & a_Delta)
+{
+	m_Protocol->SendTeamChangeMembership(a_TeamName, a_IsAdding, a_Delta);
+}
+
+
+
+
+
 void cClientHandle::SendSetSubTitle(const cCompositeChat & a_SubTitle)
 {
 	m_Protocol->SendSetSubTitle(a_SubTitle);

src/ClientHandle.h

@@ -213,6 +213,8 @@ class cClientHandle  // tolua_export
 	void SendSpawnVehicle               (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType = 0);
 	void SendStatistics                 (const cStatManager & a_Manager);
 	void SendTabCompletionResults       (const AStringVector & a_Results);
+	void SendTeam                       (const cTeam & a_Team, cTeam::eProtocolAction a_Mode);
+	void SendTeamChangeMembership       (const AString & a_TeamName, bool a_IsAdding, const std::set<AString> & a_Delta);
 	void SendTeleportEntity             (const cEntity & a_Entity);
 	void SendThunderbolt                (int a_BlockX, int a_BlockY, int a_BlockZ);
 	void SendTitleTimes                 (int a_FadeInTicks, int a_DisplayTicks, int a_FadeOutTicks);  // tolua_export

src/Protocol/Protocol.h

@@ -131,6 +131,8 @@ class cProtocol
 	virtual void SendSpawnVehicle               (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) = 0;
 	virtual void SendStatistics                 (const cStatManager & a_Manager) = 0;
 	virtual void SendTabCompletionResults       (const AStringVector & a_Results) = 0;
+	virtual void SendTeam                       (const cTeam & a_Team, Byte a_Mode) = 0;
+	virtual void SendTeamChangeMembership       (const AString & a_TeamName, bool a_IsAdding, const std::set<AString> & a_Delta) = 0;
 	virtual void SendTeleportEntity             (const cEntity & a_Entity) = 0;
 	virtual void SendThunderbolt                (int a_BlockX, int a_BlockY, int a_BlockZ) = 0;
 	virtual void SendTitleTimes                 (int a_FadeInTicks, int a_DisplayTicks, int a_FadeOutTicks) = 0;