1
0

Merge remote-tracking branch 'origin/master' into hunger

This commit is contained in:
madmaxoft 2013-07-29 09:52:00 +02:00
commit 4beb495f93
2 changed files with 3 additions and 8 deletions

View File

@ -68,7 +68,7 @@ function Initialize(Plugin)
IniFile = cIniFile("settings.ini") IniFile = cIniFile("settings.ini")
if ( IniFile:ReadFile() == true ) then if ( IniFile:ReadFile() == true ) then
HardCore = IniFile:GetValueSet("GameMode", "Hardcore", "false") HardCore = IniFile:GetValueSet("GameMode", "Hardcore", "false")
LimitWorld = IniFile:GetValueSetB("Worlds", "LimitWorld", true) LimitWorld = IniFile:GetValueSetB("Worlds", "LimitWorld", false)
LimitWorldWidth = IniFile:GetValueSetI("Worlds", "LimitWorldWidth", 10) LimitWorldWidth = IniFile:GetValueSetI("Worlds", "LimitWorldWidth", 10)
SPAWNPROTECT = IniFile:GetValueSetB("SpawnProtect", "Enable", true) SPAWNPROTECT = IniFile:GetValueSetB("SpawnProtect", "Enable", true)
PROTECTRADIUS = IniFile:GetValueSetI("SpawnProtect", "ProtectRadius", 20) PROTECTRADIUS = IniFile:GetValueSetI("SpawnProtect", "ProtectRadius", 20)
@ -76,7 +76,7 @@ function Initialize(Plugin)
IniFile:WriteFile() IniFile:WriteFile()
end end
if LimitWorldWidth ~= nil then if LimitWorld == true then
cRoot:Get():ForEachWorld( cRoot:Get():ForEachWorld(
function( World ) function( World )
LimitWorldsCuboid[World:GetName()] = cCuboid() LimitWorldsCuboid[World:GetName()] = cCuboid()
@ -139,8 +139,6 @@ end
--BEGIN SPAWNPROTECT LOGFILE CODE (COURTSEY OF BEARBIN) --BEGIN SPAWNPROTECT LOGFILE CODE (COURTSEY OF BEARBIN)
function WriteLog(breakPlace, X, Y, Z, player, id, meta) function WriteLog(breakPlace, X, Y, Z, player, id, meta)
PLUGIN = Plugin
local logText = {} local logText = {}
table.insert(logText, player) table.insert(logText, player)
@ -179,6 +177,6 @@ function WarnPlayer(Player)
end end
function OnDisable() function OnDisable()
LOG( "Disabled " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() ) LOG( "Disabled Core!")
end end
--END AWESOMENESS :'( --END AWESOMENESS :'(

View File

@ -19,9 +19,6 @@ Plugin=Core
Plugin=ChunkWorx Plugin=ChunkWorx
Plugin=ChatLog Plugin=ChatLog
[HelpPlugin]
ShowPluginNames=1
[Monsters] [Monsters]
AnimalsOn=0 AnimalsOn=0
AnimalSpawnInterval=10 AnimalSpawnInterval=10