From c086775131b6a9c024658cbe037b8ef97cc2c6de Mon Sep 17 00:00:00 2001
From: LightCat <BenCat07@gmail.com>
Date: Tue, 16 Apr 2019 21:58:22 +0200
Subject: [PATCH] steamid playerlist 0 fix, Add more OOB spots, improve auto
 oob code

---
 data/cliplist.txt                                 |  4 +++-
 src/hacks/outofbounds.cpp                         |  3 ++-
 src/visual/menu/GuiInterface.cpp                  | 15 +++++++++++++--
 .../menu/menu/special/PlayerListController.cpp    |  3 +--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/data/cliplist.txt b/data/cliplist.txt
index 3bca689f..9b1f8cf2 100644
--- a/data/cliplist.txt
+++ b/data/cliplist.txt
@@ -22,4 +22,6 @@
 // Phase 2
 -5088.036133f, 2212.007568f, 516.031311f - 68.000061f, 15.974121f, -89.956055f, "pl_thundermountain"
 // Phase 3
-2191.972900f, 3353.798340f, 452.031311f - 68.000061f, 12.601318f, 89.972534f, "pl_thundermountain"
\ No newline at end of file
+2191.972900f, 3353.798340f, 452.031311f - 68.000061f, 12.601318f, 89.972534f, "pl_thundermountain"
+4889.611328f, 4287.997070f, 576.031250f, 11.911232f, 179.998672f, "pl_thundermountain"
+-3327.432129f, -928.000366f, -311.968750f, 7.452800f, 89.949173f, "cp_mossrock"
\ No newline at end of file
diff --git a/src/hacks/outofbounds.cpp b/src/hacks/outofbounds.cpp
index 81428fc2..5c522ba1 100644
--- a/src/hacks/outofbounds.cpp
+++ b/src/hacks/outofbounds.cpp
@@ -284,7 +284,8 @@ void oobcm()
                         }
                         else
                         {
-                            current_user_cmd->buttons |= IN_ATTACK;
+                            if (CE_BYTE(ent, netvar.m_bCanPlace))
+                                current_user_cmd->buttons |= IN_ATTACK;
                             failed = false;
                             if (yaw_offset >= 0.01f)
                             {
diff --git a/src/visual/menu/GuiInterface.cpp b/src/visual/menu/GuiInterface.cpp
index e5c85545..1d66212b 100644
--- a/src/visual/menu/GuiInterface.cpp
+++ b/src/visual/menu/GuiInterface.cpp
@@ -26,7 +26,6 @@ static zerokernel::special::PlayerListData createPlayerListData(int userid)
     data.teamId  = g_pPlayerResource->getTeam(idx) - 1;
     data.dead    = !g_pPlayerResource->isAlive(idx);
     data.steam   = info.friendsID;
-    logging::Info("Player name: %s", info.name);
     snprintf(data.name, 31, "%s", info.name);
     return data;
 }
@@ -140,11 +139,23 @@ void gui::draw()
     zerokernel::Menu::instance->update();
     zerokernel::Menu::instance->render();
 }
-
+static Timer update_players{};
 bool gui::handleSdlEvent(SDL_Event *event)
 {
     if (!zerokernel::Menu::instance)
         return false;
+    if (controller && CE_GOOD(LOCAL_E) && update_players.test_and_set(10000))
+    {
+        controller->removeAll();
+        for (auto i = 1; i < 32; ++i)
+        {
+            player_info_s info{};
+            if (g_IEngine->GetPlayerInfo(i, &info))
+            {
+                controller->addPlayer(info.userID, createPlayerListData(info.userID));
+            }
+        }
+    }
     if (event->type == SDL_KEYDOWN)
     {
         if (event->key.keysym.scancode == (*open_gui_button).scan)
diff --git a/src/visual/menu/menu/special/PlayerListController.cpp b/src/visual/menu/menu/special/PlayerListController.cpp
index 902cc297..b24c7ff5 100644
--- a/src/visual/menu/menu/special/PlayerListController.cpp
+++ b/src/visual/menu/menu/special/PlayerListController.cpp
@@ -177,7 +177,6 @@ void zerokernel::special::PlayerListController::addPlayer(int id, zerokernel::sp
         }
         updateRow(trow);
         table.addObject(std::move(row));
-        printf("Table %u\n", table.objects.size());
     }
     else
     {
@@ -230,4 +229,4 @@ void zerokernel::special::PlayerListController::updateRow(zerokernel::TRow *row)
     {
         el->set(class_names[classId]);
     }
-}
\ No newline at end of file
+}