From 0c2c803a168183c95d9b191cd8b35debed5d3f54 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon, 4 Nov 2013 22:06:23 +0000
Subject: [PATCH] Removed settings/webadmin.example.ini files

Additionally, added some default plugins to autogeneration. Also moved
nbt examples to docs/NBT Examples.
---
 Install/Zip2008.list                          |  2 --
 MCServer/settings.example.ini                 | 32 -------------------
 MCServer/webadmin.example.ini                 |  6 ----
 .../NBT Examples}/single chunk NBT data.txt   |  0
 .../NBT Examples}/tile entities.txt           |  0
 source/PluginManager.cpp                      |  7 +++-
 6 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 MCServer/settings.example.ini
 delete mode 100644 MCServer/webadmin.example.ini
 rename {nbt examples => docs/NBT Examples}/single chunk NBT data.txt (100%)
 rename {nbt examples => docs/NBT Examples}/tile entities.txt (100%)

diff --git a/Install/Zip2008.list b/Install/Zip2008.list
index 0b45d81f3..fbfc06e0c 100644
--- a/Install/Zip2008.list
+++ b/Install/Zip2008.list
@@ -11,5 +11,3 @@ Lua-LICENSE.txt
 LuaExpat-license.html
 LuaSQLite3-LICENSE.txt
 MersenneTwister-LICENSE.txt
-settings.example.ini
-webadmin.example.ini
\ No newline at end of file
diff --git a/MCServer/settings.example.ini b/MCServer/settings.example.ini
deleted file mode 100644
index 3daeb00f1..000000000
--- a/MCServer/settings.example.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-; This is the main server configuration
-; For help, please visit the Wiki page: http://www.mc-server.org/wiki/doku.php?id=configure:settings.ini
-; Most of these settings can also be set using the webadmin interface, if it is enabled.
-
-[Server]
-Port=25565
-MaxPlayers=100
-Description=MCServer - in C++
-DefaultViewDistance=9
-
-[Worlds]
-DefaultWorld=world
-
-[Plugins]
-; Plugin=Debuggers
-; Plugin=DiamondMover
-; Plugin=HookNotify
-Plugin=Core
-Plugin=ChunkWorx
-Plugin=ChatLog
-Plugin=TransAPI
-
-[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
-
diff --git a/MCServer/webadmin.example.ini b/MCServer/webadmin.example.ini
deleted file mode 100644
index 8597225bb..000000000
--- a/MCServer/webadmin.example.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[WebAdmin]
-Enabled=1
-Port=8081
-
-[User:admin]
-Password=admin
\ No newline at end of file
diff --git a/nbt examples/single chunk NBT data.txt b/docs/NBT Examples/single chunk NBT data.txt
similarity index 100%
rename from nbt examples/single chunk NBT data.txt
rename to docs/NBT Examples/single chunk NBT data.txt
diff --git a/nbt examples/tile entities.txt b/docs/NBT Examples/tile entities.txt
similarity index 100%
rename from nbt examples/tile entities.txt
rename to docs/NBT Examples/tile entities.txt
diff --git a/source/PluginManager.cpp b/source/PluginManager.cpp
index ac79942b7..0ff7736ec 100644
--- a/source/PluginManager.cpp
+++ b/source/PluginManager.cpp
@@ -119,7 +119,12 @@ void cPluginManager::ReloadPluginsNow(cIniFile & a_SettingsIni)
 	if (KeyNum == -1)
 	{
 		a_SettingsIni.AddKeyName("Plugins");
-		a_SettingsIni.AddKeyComment("Plugins", " Plugin=Core");
+		a_SettingsIni.AddKeyComment("Plugins", " Plugin=Debuggers");
+		a_SettingsIni.AddKeyComment("Plugins", " Plugin=HookNotify");
+		a_SettingsIni.AddKeyComment("Plugins", " Plugin=ChunkWorx");
+		a_SettingsIni.SetValue("Plugins", "Plugin", "Core");
+		a_SettingsIni.SetValue("Plugins", "Plugin", "TransAPI");
+		a_SettingsIni.SetValue("Plugins", "Plugin", "ChatLog");
 	}
 	else if (NumPlugins > 0)
 	{