From 04f18aa0c8502a960af164085699720cc54d57fc Mon Sep 17 00:00:00 2001
From: DawnFire42 <justin.c.durocher@gmail.com>
Date: Tue, 30 Jun 2026 09:36:21 -0400
Subject: [PATCH] rebase fix

---
 cockatrice/src/game_graphics/player/menu/command_zone_menu.cpp  | 2 +-
 .../libcockatrice/network/server/remote/game/server_player.cpp  | 1 +
 tests/server_counter_test.cpp                                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/game_graphics/player/menu/command_zone_menu.cpp b/cockatrice/src/game_graphics/player/menu/command_zone_menu.cpp
index 60ea4d90a..baf29a6b1 100644
--- a/cockatrice/src/game_graphics/player/menu/command_zone_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/command_zone_menu.cpp
@@ -9,7 +9,7 @@
 #include "../player_graphics_item.h"
 
 #include <libcockatrice/utility/counter_ids.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/utility/counter_limits.h>
 #include <libcockatrice/utility/zone_names.h>
 
 CommandZoneMenu::CommandZoneMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
index 78d9204a8..219582c15 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -50,6 +50,7 @@
 #include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/counter_ids.h>
+#include <libcockatrice/utility/counter_limits.h>
 #include <libcockatrice/utility/string_limits.h>
 #include <libcockatrice/utility/zone_names.h>
 
diff --git a/tests/server_counter_test.cpp b/tests/server_counter_test.cpp
index aa0f82104..bde632a27 100644
--- a/tests/server_counter_test.cpp
+++ b/tests/server_counter_test.cpp
@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/game/server_counter.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/utility/counter_limits.h>
 #include <limits>
 
 TEST(ServerCounter, IncrementDoesNotOverflow)