summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradmin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-04 20:44:42 +0100
committeradmin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-04 20:44:42 +0100
commitda87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3 (patch)
tree41afdcdb5683b74e259719c5ddb873fbc5302b8d
parentFixed a bug in source/cClientHandle.h (diff)
downloadcuberite-da87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3.tar
cuberite-da87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3.tar.gz
cuberite-da87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3.tar.bz2
cuberite-da87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3.tar.lz
cuberite-da87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3.tar.xz
cuberite-da87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3.tar.zst
cuberite-da87f9f3c1bb98ed2d20bf1f6b1ec72f87c5ded3.zip
Diffstat (limited to '')
-rw-r--r--settings.ini26
-rw-r--r--source/SquirrelBindings.cpp4
2 files changed, 6 insertions, 24 deletions
diff --git a/settings.ini b/settings.ini
index 9fb0d37dd..7fd9b5809 100644
--- a/settings.ini
+++ b/settings.ini
@@ -1,32 +1,14 @@
[Server]
Port=25565
-MaxPlayers=100
-Description=OmenCraft.com, powered by MCServer!
+MaxPlayers=10000
+Description=MCServer - Slightly more custom!
[Worlds]
DefaultWorld=world
-World=onion
+;World=world_sexy
[Plugins]
-Squirrel=SquirrelChatLog
-Plugin=Core
-Plugin=blehu
-Plugin=Fire
-Plugin=Ventilator
-Plugin=DevModeTest
-Plugin=LuaRunFunction
-Plugin=CuboidPlus
-Plugin=BasicCmds
-Plugin=BringPlugin
-Plugin=AreaPlugin
-Plugin=JumpTo
-Plugin=AddToGroup
-Plugin=adminchat
-Plugin=SetGroupRank
-Plugin=DungeonBuilder
-Plugin=Griefer
-Plugin=ChatColor
-Plugin=Trace
+;Squirrel=SquirrelChatLog
[HelpPlugin]
ShowPluginNames=1
diff --git a/source/SquirrelBindings.cpp b/source/SquirrelBindings.cpp
index 69b761e42..392436ace 100644
--- a/source/SquirrelBindings.cpp
+++ b/source/SquirrelBindings.cpp
@@ -3,8 +3,8 @@
#include "SquirrelBindings.h"
#if USE_SQUIRREL
-//#pragma warning(disable:4100) // Getting A LOT of these warnings from SqPlus
-//#pragma warning(disable:4127)
+#pragma warning(disable:4100) // Getting A LOT of these warnings from SqPlus
+#pragma warning(disable:4127)
#include <sqplus/sqplus.h>
#include <sqplus/SquirrelObject.h>