Allow like/dislike to be used when any game is running, but now only …

…allow it to be used on levels that are currently running a game
ClassiCube · Dec 14, 2022 · 1b3f66d · 1b3f66d
1 parent 566ca7e
commit 1b3f66d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/MCGalaxy/Commands/Command.Helpers.cs b/MCGalaxy/Commands/Command.Helpers.cs
@@ -30,8 +30,6 @@ public abstract partial class Command {
             if (enable == CommandEnable.Economy && !Economy.Enabled)
                 return "economy is disabled.";
 
-            if (enable == bothFlags && !(ZSGame.Instance.Running || LSGame.Instance.Running))
-                return "neither zombie nor lava survival is running.";
             if (enable == CommandEnable.Zombie && !ZSGame.Instance.Running)
                 return "zombie survival is not running.";
             if (enable == CommandEnable.Lava)

diff --git a/MCGalaxy/Commands/Fun/RateMapCmds.cs b/MCGalaxy/Commands/Fun/RateMapCmds.cs
@@ -16,20 +16,26 @@
     permissions and limitations under the Licenses.
  */
 using System;
+using MCGalaxy.Games;
 
-namespace MCGalaxy.Commands.Fun {
-
-    public class CmdLike : Command2 {
+namespace MCGalaxy.Commands.Fun 
+{
+    public class CmdLike : Command2 
+    {
         public override string name { get { return "Like"; } }
         public override string type { get { return CommandTypes.Games; } }
-        public override CommandEnable Enabled { get { return CommandEnable.Zombie | CommandEnable.Lava; } }
         public override bool SuperUseable { get { return false; } }
 
         public override void Use(Player p, string message, CommandData data) { RateMap(p, true); }
 
         protected bool RateMap(Player p, bool like) {
             string prefix = like ? "" : "dis";
 
+            IGame game = IGame.GameOn(p.level);
+            if (game == null) {
+                p.Message("Can only {0}like this map when a game is running on it.", prefix); return false; 
+            }
+
             if (p.Game.RatedMap) {
                 prefix = p.Game.LikedMap ? "" : "dis";
                 p.Message("You have already {0}liked this map.", prefix); return false;