diff options
| -rwxr-xr-x | converter/region/r.0.0.mcr | bin | 4939776 -> 4939776 bytes | |||
| -rw-r--r-- | settings.ini | 29 | ||||
| -rw-r--r-- | source/SquirrelBindings.cpp | 6 | ||||
| -rw-r--r-- | source/SquirrelBindings.h | 2 | ||||
| -rw-r--r-- | source/cClientHandle.h | 2 | ||||
| -rw-r--r-- | source/cPluginManager.cpp | 2 | ||||
| -rw-r--r-- | users.ini | 3 |
7 files changed, 30 insertions, 14 deletions
diff --git a/converter/region/r.0.0.mcr b/converter/region/r.0.0.mcr Binary files differindex 56b19c4ee..47ff73161 100755 --- a/converter/region/r.0.0.mcr +++ b/converter/region/r.0.0.mcr diff --git a/settings.ini b/settings.ini index 14c36e4d9..9fb0d37dd 100644 --- a/settings.ini +++ b/settings.ini @@ -1,15 +1,32 @@ [Server]
Port=25565
-MaxPlayers=10000
-Description=MCServer - Slightly more custom!
+MaxPlayers=100
+Description=OmenCraft.com, powered by MCServer!
[Worlds]
DefaultWorld=world
-;World=world_sexy
+World=onion
[Plugins]
-NewPlugin=Core
-;Squirrel=SquirrelChatLog
+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
[HelpPlugin]
ShowPluginNames=1
@@ -25,4 +42,4 @@ Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creepe [Authentication]
Server=session.minecraft.net
Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID%
-Authenticate=0
\ No newline at end of file +Authenticate=0
diff --git a/source/SquirrelBindings.cpp b/source/SquirrelBindings.cpp index 9f64b2c9b..69b761e42 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>
@@ -138,4 +138,4 @@ void SquirrelBindings::Bind( HSQUIRRELVM a_SquirrelVM ) }
-#endif
\ No newline at end of file +#endif
diff --git a/source/SquirrelBindings.h b/source/SquirrelBindings.h index 492014560..858428414 100644 --- a/source/SquirrelBindings.h +++ b/source/SquirrelBindings.h @@ -12,4 +12,4 @@ public: static bool IsBound;
};
-#endif
\ No newline at end of file +#endif
diff --git a/source/cClientHandle.h b/source/cClientHandle.h index 75505c3f7..56b9382e8 100644 --- a/source/cClientHandle.h +++ b/source/cClientHandle.h @@ -11,7 +11,7 @@ #ifndef CCLIENTHANDLE_H_INCLUDED
#define CCLIENTHANDLE_H_INCLUDED
-#include "Packets/cPacket.h"
+#include "packets/cPacket.h"
#include "Vector3d.h"
#include "packets/cPacket_KeepAlive.h"
diff --git a/source/cPluginManager.cpp b/source/cPluginManager.cpp index de49d81e9..eefc50491 100644 --- a/source/cPluginManager.cpp +++ b/source/cPluginManager.cpp @@ -510,4 +510,4 @@ void cPluginManager::AddHook( cPlugin* a_Plugin, PluginHook a_Hook ) unsigned int cPluginManager::GetNumPlugins()
{
return m_pState->Plugins.size();
-}
\ No newline at end of file +}
@@ -7,7 +7,7 @@ Groups=Admins [Luthrandel]
Groups=Admins
-[Cruisecho]
+[cruisecho]
Groups=Admins
[Kwen]
@@ -18,4 +18,3 @@ Groups=Admins [xoft]
Groups=Admins
-
|