From ce94150be0d935a6741a5a969227cbc42e26161d Mon Sep 17 00:00:00 2001
From: Tyler Lentz <tlentz@ucsd.edu>
Date: Fri, 7 Jun 2024 00:43:54 -0700
Subject: [PATCH] fix print statement KILLING EVERYTHING and fix mirror getting
 you stuck when you have a full inventory

---
 config.json                         | 10 +++++-----
 src/client/client.cpp               |  1 -
 src/server/game/servergamestate.cpp |  3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.json b/config.json
index 8157691f..4ec18d7d 100644
--- a/config.json
+++ b/config.json
@@ -2,8 +2,8 @@
   "game": {
     "maze": {
       "directory": "maps",
-      "procedural": true,
-      "maze_file": "demo/candidate5"
+      "procedural": false,
+      "maze_file": "test/itemRoom.maze"
     },
     "disable_enemies": false
   },
@@ -14,14 +14,14 @@
   "server": {
     "lobby_name": "Hope you're doing well!",
     "lobby_broadcast": true,
-    "max_players": 4,
+    "max_players": 2,
     "disable_dm": false,
-    "skip_intro": true
+    "skip_intro": false
   },
   "client": {
     "default_name": "Conan O'Brien",
     "lobby_discovery": true,
-    "fullscreen": false,
+    "fullscreen": true,
     "draw_bboxes": false,
     "fps_counter": true,
     "presentation": false,
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 5cfce042..e2867082 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1432,7 +1432,6 @@ void Client::lightingPass() {
         }
 
         if (!sharedObject->pointLightInfo.has_value()) {
-            std::cout << "got a torch without point light info for some reason" << std::endl;
             continue;
         }                
         
diff --git a/src/server/game/servergamestate.cpp b/src/server/game/servergamestate.cpp
index 155e741d..ef9687d3 100644
--- a/src/server/game/servergamestate.cpp
+++ b/src/server/game/servergamestate.cpp
@@ -1079,7 +1079,8 @@ bool ServerGameState::hasObjectCollided(Object* object, glm::vec3 newCornerPosit
 					otherObj->type == ObjectType::WeaponCollider ||
 					otherObj->type == ObjectType::Slime ||
 					otherObj->type == ObjectType::TeleporterTrap ||
-					otherObj->type == ObjectType::Torchlight) {
+					otherObj->type == ObjectType::Torchlight ||
+					otherObj->type == ObjectType::Mirror) {
 					continue;
 				}