1
0

Merge branch 'master' into BlockTracing

This commit is contained in:
madmaxoft 2013-08-03 20:45:08 +02:00
commit 106308796d
15 changed files with 40 additions and 138 deletions

3
Install/.gitignore vendored
View File

@ -1,3 +1,4 @@
MCServer.exe MCServer.exe
*.7z *.7z
*.tag *.tag
*.example.ini

View File

@ -6,13 +6,10 @@
..\MCServer\items.ini ..\MCServer\items.ini
..\MCServer\monsters.ini ..\MCServer\monsters.ini
MCServer*debug.cmd MCServer*debug.cmd
banned.example.ini *.example.ini
groups.example.ini
Lua-LICENSE.txt Lua-LICENSE.txt
LuaExpat-license.html LuaExpat-license.html
LuaSQLite3-LICENSE.txt LuaSQLite3-LICENSE.txt
MersenneTwister-LICENSE.txt MersenneTwister-LICENSE.txt
settings.example.ini settings.example.ini
users.example.ini webadmin.example.ini
webadmin.example.ini
whitelist.example.ini

View File

@ -1,31 +0,0 @@
[Server]
Port=25565
MaxPlayers=42
Description=MCServer - Slightly more custom!
[Worlds]
DefaultWorld=world
;World=world_sexy
[Plugins]
NewPlugin=Core
NewPlugin=ChatLog
[HelpPlugin]
ShowPluginNames=1
[Physics]
Water=0
[Redstone]
SimulateRedstone=0
[Monsters]
AnimalsOn=0
AnimalSpawnInterval=10
Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creeper,Ghast,Silverfish,Skeleton,Slime,Spider,Zombie
[Authentication]
Server=session.minecraft.net
Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID%
Authenticate=0

View File

@ -1,8 +0,0 @@
[SomeAdmin]
Groups=Admins
[FancyModerator]
Groups=Moderators
[ImportantPerson]
Groups=Vips

View File

@ -1,6 +0,0 @@
[WebAdmin]
Enabled=1
Port=8080
[User:admin]
Password=admin

18
MCServer/README.txt Normal file
View File

@ -0,0 +1,18 @@
/============================\
| Custom Minecraft Server |
| Created by Kevin Bansberg |
| A.K.A. FakeTruth |
| Monsters by Alex Sonek |
| A.K.A. Duralex |
| Stuff by Mattes D |
| A.K.A. _Xoft(o) |
|============================|
| Info: WWW.MC-SERVER.ORG |
| WWW.AE-C.NET\n") |
| WWW.RBTHINKTANK.COM |
| Mail: faketruth@gmail.com |
\============================/
Compatible clients: 1.2.4, 1.2.5, 1.3.1, 1.3.2, 1.4.2, 1.4.4, 1.4.5, 1.4.6, 1.4.7, 1.5, 1.5.1, 1.5.2, 1.6.1, 1.6.2
Compatible protocol versions: 29, 39, 47, 49, 51, 60, 61, 73, 74

View File

@ -1,3 +1,3 @@
[Banned] [Banned]
;PlayerName=1 ;PlayerName=1

View File

@ -1,17 +0,0 @@
[Admins]
Permissions=*
Color=c
[Mods]
Color=5
Inherits=Vips
Permissions=core.time,core.item
[Vips]
Permissions=core.teleport
Color=2
Inherits=Default
[Default]
Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn
Color=7

View File

@ -1,6 +1,6 @@
[WhiteListSettings] [WhiteListSettings]
WhiteListOn=0 WhiteListOn=0
[WhiteList] [WhiteList]
;PlayerName=1 ;PlayerName=1

View File

@ -92,6 +92,9 @@ if errorlevel 1 goto haderror
:: Copy all the example ini files into the Install folder for zipping:
copy MCServer\*.example.ini Install\*.example.ini
:: Use 7-zip to compress the resulting files into a single file: :: Use 7-zip to compress the resulting files into a single file:
set FILESUFFIX=%MYYEAR%_%MYMONTH%_%MYDAY%_%MYTIME%_%COMMITID% set FILESUFFIX=%MYYEAR%_%MYMONTH%_%MYDAY%_%MYTIME%_%COMMITID%
echo FILESUFFIX=%FILESUFFIX% echo FILESUFFIX=%FILESUFFIX%

View File

@ -1,39 +0,0 @@
@echo off
:: UpdateVersions.cmd
:: This script processes all *.template files into their non-templated variants using subwcrev, substituting WC-related keywords in the process
:: subwcrev is expected to be in path; you can pass the correct path for your system as env var "subwcrev"
:: Subwcrev (from TortoiseSVN, for querying revision number; by default in PATH):
if %subwcrev%a == a set subwcrev=subwcrev
:: Copy all *.template files into their non-template versions, substituting SVN keywords:
for /r %%X in (*.template) do (
%subwcrev% . "%%X" "%%~dpX%%~nX"
if errorlevel 1 goto haderror
)
goto end
:haderror
echo an error was encountered, check command output above
pause
goto finished
:end
if "a%1" == "a" pause
:finished

View File

@ -1,4 +1,3 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "GroupManager.h" #include "GroupManager.h"
@ -88,7 +87,7 @@ cGroupManager::cGroupManager()
for( unsigned int i = 0; i < Split.size(); i++) for( unsigned int i = 0; i < Split.size(); i++)
{ {
Group->AddPermission( Split[i] ); Group->AddPermission( Split[i] );
LOGINFO("Permission: %s", Split[i].c_str() ); //LOGINFO("Permission: %s", Split[i].c_str() );
} }
} }
@ -102,7 +101,7 @@ cGroupManager::cGroupManager()
} }
} }
} }
LOG("-- Done Loading Groups --"); LOG("-- Groups Successfully Loaded --");
} }

View File

@ -1,4 +1,3 @@
// ReDucTor is an awesome guy who helped me a lot // ReDucTor is an awesome guy who helped me a lot
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
@ -130,20 +129,6 @@ bool cServer::InitServer(cIniFile & a_SettingsIni)
return false; return false;
} }
printf("/============================\\\n");
printf("| Custom Minecraft Server |\n");
printf("| Created by Kevin Bansberg |\n");
printf("| A.K.A. FakeTruth |\n");
printf("| Monsters by Alex Sonek |\n");
printf("| A.K.A. Duralex |\n");
printf("| Stuff by Mattes D |\n");
printf("| A.K.A. _Xoft(o) |\n");
printf("\\============================/\n");
printf("More info: WWW.MC-SERVER.ORG\n");
printf(" WWW.AE-C.NET\n");
printf(" WWW.RBTHINKTANK.COM\n");
printf("email: faketruth@gmail.com\n\n");
LOG("Starting up server."); LOG("Starting up server.");
LOGINFO("Compatible clients: %s", MCS_CLIENT_VERSIONS); LOGINFO("Compatible clients: %s", MCS_CLIENT_VERSIONS);
LOGINFO("Compatible protocol versions %s", MCS_PROTOCOL_VERSIONS); LOGINFO("Compatible protocol versions %s", MCS_PROTOCOL_VERSIONS);
@ -481,11 +466,11 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac
void cServer::BindBuiltInConsoleCommands(void) void cServer::BindBuiltInConsoleCommands(void)
{ {
cPluginManager * PlgMgr = cPluginManager::Get(); cPluginManager * PlgMgr = cPluginManager::Get();
PlgMgr->BindConsoleCommand("restart", NULL, "Restarts the server cleanly"); PlgMgr->BindConsoleCommand("restart", NULL, " - Restarts the server cleanly");
PlgMgr->BindConsoleCommand("stop", NULL, "Stops the server cleanly"); PlgMgr->BindConsoleCommand("stop", NULL, " - Stops the server cleanly");
PlgMgr->BindConsoleCommand("chunkstats", NULL, "Displays detailed chunk memory statistics"); PlgMgr->BindConsoleCommand("chunkstats", NULL, " - Displays detailed chunk memory statistics");
#if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER) #if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER)
PlgMgr->BindConsoleCommand("dumpmem", NULL, "Dumps all used memory blocks together with their callstacks into memdump.xml"); PlgMgr->BindConsoleCommand("dumpmem", NULL, " - Dumps all used memory blocks together with their callstacks into memdump.xml");
#endif #endif
} }