6 files changed, 78 insertions, 3 deletions

diff --git a/lib/cryptopp/cryptlib.cpp b/lib/cryptopp/cryptlib.cpp
index df138ddb0..661340b8d 100644
--- a/lib/cryptopp/cryptlib.cpp
+++ b/lib/cryptopp/cryptlib.cpp
@@ -4,6 +4,12 @@
 
 #ifndef CRYPTOPP_IMPORTS
 
+
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4702)
+#endif
+
 #include "cryptlib.h"
 #include "misc.h"
 #include "filters.h"
@@ -825,4 +831,8 @@ void AuthenticatedKeyAgreementDomain::GenerateEphemeralKeyPair(RandomNumberGener
 
 NAMESPACE_END
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
+
 #endif
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index 46ac4ef89..ab15509b7 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
-#include "cryptopp/randpool.h"
 #include "Protocol132.h"
 #include "../Root.h"
 #include "../Server.h"
@@ -19,8 +18,20 @@
 #include "../WorldStorage/FastNBT.h"
 #include "../StringCompression.h"
 
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
 
+#include "cryptopp/randpool.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
 
 
 #define HANDLE_PACKET_READ(Proc, Type, Var) \
diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h
index f76272b8d..d36384a88 100644
--- a/src/Protocol/Protocol132.h
+++ b/src/Protocol/Protocol132.h
@@ -10,9 +10,23 @@
 #pragma once
 
 #include "Protocol125.h"
+
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
+
 #include "cryptopp/modes.h"
 #include "cryptopp/aes.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
+
 
 
 
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp
index 28122034c..926fe6ee8 100644
--- a/src/Protocol/Protocol14x.cpp
+++ b/src/Protocol/Protocol14x.cpp
@@ -16,7 +16,6 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../Root.h"
 #include "../Server.h"
 #include "../ClientHandle.h"
-#include "cryptopp/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
 #include "../Entities/Player.h"
@@ -25,8 +24,20 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../Entities/Pickup.h"
 #include "../Entities/FallingBlock.h"
 
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
 
+#include "cryptopp/randpool.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
 
 
 #define HANDLE_PACKET_READ(Proc, Type, Var) \
diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h
index cc0eda1e7..23ff2365d 100644
--- a/src/Protocol/Protocol17x.h
+++ b/src/Protocol/Protocol17x.h
@@ -16,9 +16,23 @@ Declares the 1.7.x protocol classes:
 
 #include "Protocol.h"
 #include "../ByteBuffer.h"
+
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
+
 #include "cryptopp/modes.h"
 #include "cryptopp/aes.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
+
 
 
 
diff --git a/src/Server.h b/src/Server.h
index 1f94bb3da..e62c4c7b7 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -11,9 +11,24 @@
 
 #include "OSSupport/SocketThreads.h"
 #include "OSSupport/ListenThread.h"
+
+#include "RCONServer.h"
+
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
+
 #include "cryptopp/rsa.h"
 #include "cryptopp/randpool.h"
-#include "RCONServer.h"
+
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif