Fix conditionals in the first and third parameter when user inputs like `calc 4 - +`

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / scores.qc

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 0680d6a491730df2bfedbc252f870bd5c651ee02..12175bb764f036435c1f745c0ac2ddc12fe74777 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -5,6 +5,7 @@
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>
 #include <server/mutators/_mod.qh>
+#include <server/round_handler.qh>
 #include <common/net_linked.qh>
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
@@ -107,8 +108,7 @@ float TeamScore_AddToTeam(int t, float scorefield, float score)
 {
        entity s;
 
-       if(game_stopped || time < game_starttime
-               || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
+       if(game_stopped)
        {
                score = 0;
        }
@@ -337,8 +337,7 @@ float PlayerScore_Add(entity player, PlayerScoreField scorefield, float score)
        bool mutator_returnvalue = MUTATOR_CALLHOOK(AddPlayerScore, scorefield, score, player);
        score = M_ARGV(1, float);
 
-       if((!mutator_returnvalue && game_stopped) || time < game_starttime
-               || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
+       if(!mutator_returnvalue && game_stopped)
        {
                score = 0;
        }