Changeset

5285:19381ed1cc02

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 29 Dec 2012 19:13:42 +0100
parents 5283:a3a4de5104ee (current diff) 5284:5d2282a29387 (diff)
children 5303:19a4a3462574
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/net/server.lua	Fri Dec 28 15:14:11 2012 +0100
+++ b/net/server.lua	Sat Dec 29 19:13:42 2012 +0100
@@ -62,9 +62,8 @@
 			for k, v in pairs(event_settings) do
 				server.cfg[k] = v;
 			end
-			return true;
 		else
-			return server.changesettings(settings);
+			server.changesettings(settings);
 		end
 	end
 	load_config();