From 470111d4a89ee5a61a08a67f25281e43dd8c0e21 Mon Sep 17 00:00:00 2001
From: Tyler Karaszewski <tyler@expensify.com>
Date: Thu, 29 Aug 2024 09:57:09 -0700
Subject: [PATCH 1/2] Fix missing dir error

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index aeb33f9b6..71a34084a 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ test/clustertest/testplugin/testplugin.so : $(TESTPLUGINOBJ) $(TESTPLUGINCPP) $(
 $(INTERMEDIATEDIR)/BedrockServer.d $(INTERMEDIATEDIR)/BedrockServer.o: BedrockServer.cpp
 	$(CXX) $(CXXFLAGS) -MMD -MF $(INTERMEDIATEDIR)/BedrockServer.d -MT $(INTERMEDIATEDIR)/BedrockServer.o $(GIT_REVISION) -o $(INTERMEDIATEDIR)/BedrockServer.o -c BedrockServer.cpp
 
-$(INTERMEDIATEDIR)/main.d $(INTERMEDIATEDIR)/main.o: main.cpp
+$(INTERMEDIATEDIR)/main.d $(INTERMEDIATEDIR)/main.o: main.cpp $(INTERMEDIATEDIR)
 	$(CXX) $(CXXFLAGS) -MMD -MF $(INTERMEDIATEDIR)/main.d -MT $(INTERMEDIATEDIR)/main.o $(GIT_REVISION) -o $(INTERMEDIATEDIR)/main.o -c main.cpp
 
 $(INTERMEDIATEDIR)/plugins/MySQL.d $(INTERMEDIATEDIR)/plugins/MySQL.o: plugins/MySQL.cpp

From b2af5d99ca090207826d38e8fcdd218641e4e9c1 Mon Sep 17 00:00:00 2001
From: Tyler Karaszewski <tyler@expensify.com>
Date: Fri, 30 Aug 2024 09:46:30 -0700
Subject: [PATCH 2/2] Some cleanup

---
 .gitignore        | 3 +++
 BedrockServer.cpp | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a2e1c142..47d30c595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ libstuff/libstuff.d
 libstuff/libstuff.h.gch
 .idea
 .clangd
+.nfs*
+.cache
+compile_commands.json
diff --git a/BedrockServer.cpp b/BedrockServer.cpp
index 3d2108b59..84ae94d08 100644
--- a/BedrockServer.cpp
+++ b/BedrockServer.cpp
@@ -4,10 +4,8 @@
 #include <arpa/inet.h>
 #include <cstring>
 #include <fstream>
-#include <iomanip>
 #include <sys/resource.h>
 #include <sys/time.h>
-#include <signal.h>
 
 #include <bedrockVersion.h>
 #include <BedrockCore.h>