From 73f454ef37c0cf7300feecf7bb5dc6ab5eb39792 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 14:05:21 +0100 Subject: Merged in the latest version of Core Squashed commit of the following: commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit --- MCServer/Plugins/Core/main.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'MCServer') diff --git a/MCServer/Plugins/Core/main.lua b/MCServer/Plugins/Core/main.lua index e6e9b9e48..82b746d7b 100644 --- a/MCServer/Plugins/Core/main.lua +++ b/MCServer/Plugins/Core/main.lua @@ -68,7 +68,7 @@ function Initialize(Plugin) IniFile = cIniFile("settings.ini") if ( IniFile:ReadFile() == true ) then HardCore = IniFile:GetValueSet("GameMode", "Hardcore", "false") - LimitWorld = IniFile:GetValueSetB("Worlds", "LimitWorld", true) + LimitWorld = IniFile:GetValueSetB("Worlds", "LimitWorld", false) LimitWorldWidth = IniFile:GetValueSetI("Worlds", "LimitWorldWidth", 10) SPAWNPROTECT = IniFile:GetValueSetB("SpawnProtect", "Enable", true) PROTECTRADIUS = IniFile:GetValueSetI("SpawnProtect", "ProtectRadius", 20) @@ -76,7 +76,7 @@ function Initialize(Plugin) IniFile:WriteFile() end - if LimitWorldWidth ~= nil then + if LimitWorld == true then cRoot:Get():ForEachWorld( function( World ) LimitWorldsCuboid[World:GetName()] = cCuboid() @@ -139,8 +139,6 @@ end --BEGIN SPAWNPROTECT LOGFILE CODE (COURTSEY OF BEARBIN) function WriteLog(breakPlace, X, Y, Z, player, id, meta) - PLUGIN = Plugin - local logText = {} table.insert(logText, player) @@ -179,6 +177,6 @@ function WarnPlayer(Player) end function OnDisable() - LOG( "Disabled " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() ) + LOG( "Disabled Core!") end --END AWESOMENESS :'( -- cgit v1.2.3