From 7b190f5044d019e6f6c849aac325517d54372b51 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Tue, 13 Aug 2013 23:06:23 +0200
Subject: Updated the Core Lua files in MCServer project externals.

---
 VC2008/MCServer.vcproj | 68 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 18 deletions(-)

(limited to 'VC2008')

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index b39cf2769..4d850626d 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -2449,7 +2449,15 @@
 				Name="Core"
 				>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\ban.lua"
+					RelativePath="..\MCServer\Plugins\Core\back.lua"
+					>
+				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\ban-unban.lua"
+					>
+				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\clear.lua"
 					>
 				</File>
 				<File
@@ -2457,15 +2465,19 @@
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\coords.lua"
+					RelativePath="..\MCServer\Plugins\Core\do.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\gamemode.lua"
+					RelativePath="..\MCServer\Plugins\Core\functions.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\gotoworld.lua"
+					RelativePath="..\MCServer\Plugins\Core\give.lua"
+					>
+				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\gm.lua"
 					>
 				</File>
 				<File
@@ -2476,32 +2488,44 @@
 					RelativePath="..\MCServer\Plugins\Core\item.lua"
 					>
 				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\itemrepair.lua"
+					>
+				</File>
 				<File
 					RelativePath="..\MCServer\Plugins\Core\kick.lua"
 					>
 				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\kill.lua"
+					>
+				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\locate.lua"
+					>
+				</File>
 				<File
 					RelativePath="..\MCServer\Plugins\Core\main.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\motd.lua"
+					RelativePath="..\MCServer\Plugins\Core\me.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\onblockdig.lua"
+					RelativePath="..\MCServer\Plugins\Core\motd.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\onblockplace.lua"
+					RelativePath="..\MCServer\Plugins\Core\onbreakplaceblock.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\oncraftingnorecipe.lua"
+					RelativePath="..\MCServer\Plugins\Core\ondeath.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\onkilled.lua"
+					RelativePath="..\MCServer\Plugins\Core\onjoinleave.lua"
 					>
 				</File>
 				<File
@@ -2509,23 +2533,23 @@
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\onplayerjoin.lua"
+					RelativePath="..\MCServer\Plugins\Core\plugins.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\playerlist.lua"
+					RelativePath="..\MCServer\Plugins\Core\portal-worlds.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\pluginlist.lua"
+					RelativePath="..\MCServer\Plugins\Core\rank-groups.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\regeneratechunk.lua"
+					RelativePath="..\MCServer\Plugins\Core\regen.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\reload.lua"
+					RelativePath="..\MCServer\Plugins\Core\save-reload-stop.lua"
 					>
 				</File>
 				<File
@@ -2533,11 +2557,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\stop.lua"
+					RelativePath="..\MCServer\Plugins\Core\teleport.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\teleport.lua"
+					RelativePath="..\MCServer\Plugins\Core\tell.lua"
 					>
 				</File>
 				<File
@@ -2549,11 +2573,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\unban.lua"
+					RelativePath="..\MCServer\Plugins\Core\viewdistance.lua"
 					>
 				</File>
 				<File
-					RelativePath="..\MCServer\Plugins\Core\viewdistance.lua"
+					RelativePath="..\MCServer\Plugins\Core\weather.lua"
 					>
 				</File>
 				<File
@@ -2564,6 +2588,10 @@
 					RelativePath="..\MCServer\Plugins\Core\web_manageplugins.lua"
 					>
 				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\web_manageserver.lua"
+					>
+				</File>
 				<File
 					RelativePath="..\MCServer\Plugins\Core\web_permissions.lua"
 					>
@@ -2580,6 +2608,10 @@
 					RelativePath="..\MCServer\Plugins\Core\web_whitelist.lua"
 					>
 				</File>
+				<File
+					RelativePath="..\MCServer\Plugins\Core\worldlimiter.lua"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="ChatLog"
-- 
cgit v1.2.3


From 50205bc4df3c272b88a5edd81a35ac0aca8213d5 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 14 Aug 2013 22:39:12 +0200
Subject: Added simple deadlock detection code.

This will assert and then deliberately crash the server once a deadlock is detected. For detection, only the world tick threads are considered, cWorld's m_WorldAge is checked periodically and if it doesn't increment for several seconds, a deadlock is reported.
---
 VC2008/MCServer.vcproj | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'VC2008')

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 4d850626d..0dcdeb3db 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -390,6 +390,14 @@
 				RelativePath="..\source\Cuboid.h"
 				>
 			</File>
+			<File
+				RelativePath="..\source\DeadlockDetect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\source\DeadlockDetect.h"
+				>
+			</File>
 			<File
 				RelativePath="..\source\Defines.h"
 				>
-- 
cgit v1.2.3