From 5780bc89f07808af9be3497f22b2874557e7d9c8 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Wed, 29 Dec 2010 03:22:14 +0100
Subject: [PATCH] Changed variable names to reflect others. Updated readme to
 reflect changes

---
 readme.txt          | 43 ++++++++++++++++++++++---------------------
 src/MapManager.java |  6 +++---
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/readme.txt b/readme.txt
index 64ea26a6..5460c026 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,21 +1,22 @@
-Commands
---------------------------------------------------
-/map_wait [wait] - set wait between tile renders (ms)
-/map_stat - query number of tiles in render queue
-/map_regen - regenerate entire map (currently buggy)
-/map_debug - send map debugging messages
-/map_nodebug - disable map debugging messages
-/map_regenzoom - regenerates zoom-out tiles
-
-/addsign [name] - adds a named sign to the map
-/removesign [name] - removes a named sign to the map
-/listsigns - list all named signs
-/tpsign [name] - teleport to a named sign
-
-server.properties
---------------------------------------------------
-map-colorsetpath - point to colors.txt
-map-tilepath - point to web/tiles folder
-map-signspath - point to signs.txt file (do not need to create the file, one will be created when you create a sign)
-map-serverport - the port the web server runs on (default is 8123)
-map-showmarkers - a list of which markers to show on the map, comma separated if multiple (spawn, homes, warps, signs, players, all, none)
\ No newline at end of file
+Commands
+--------------------------------------------------
+/map_wait [wait] - set wait between tile renders (ms)
+/map_stat - query number of tiles in render queue
+/map_regen - regenerate entire map (currently buggy)
+/map_debug - send map debugging messages
+/map_nodebug - disable map debugging messages
+/map_regenzoom - regenerates zoom-out tiles
+
+/addsign [name] - adds a named sign to the map
+/removesign [name] - removes a named sign to the map
+/listsigns - list all named signs
+/tpsign [name] - teleport to a named sign
+
+server.properties
+--------------------------------------------------
+map-colorsetpath - point to colors.txt
+map-tilepath - point to web/tiles folder
+map-signspath - point to signs.txt file (do not need to create the file, one will be created when you create a sign)
+map-serverport - the port the web server runs on (default is 8123)
+map-showmarkers - a list of which markers to show on the map, comma separated if multiple (spawn, homes, warps, signs, players, all, none)
+map-generateportraits - whether player-portraits are generated by the server (0, 1, default: 0)
\ No newline at end of file
diff --git a/src/MapManager.java b/src/MapManager.java
index 0d36c31e..3b8228da 100644
--- a/src/MapManager.java
+++ b/src/MapManager.java
@@ -113,7 +113,7 @@ public class MapManager extends Thread {
 	public Boolean showWarps = false;
 	public Boolean showSigns = false;
 	public Boolean showPlayers = false;
-	public Boolean enablePortraitGeneration = false;
+	public Boolean generatePortraits = false;
 
 	public void debug(String msg)
 	{
@@ -137,7 +137,7 @@ public class MapManager extends Thread {
 			serverport = Integer.parseInt(properties.getString("map-serverport", "8123"));
 			datasource = properties.getString("data-source", "flatfile");
 			showmarkers = properties.getString("map-showmarkers", "all");
-			enablePortraitGeneration = !properties.getString("map-portraitgeneration", "0").equals("0");
+			generatePortraits = !properties.getString("map-generateportraits", "0").equals("0");
 		} catch(Exception ex) {
 			log.log(Level.SEVERE, "Exception while reading properties for dynamic map", ex);
 		}
@@ -902,7 +902,7 @@ public class MapManager extends Thread {
 	
 	protected void getPlayerImage(Player player)
 	{
-		if (!enablePortraitGeneration) return;
+		if (!generatePortraits) return;
 		String urlString = "http://www.minecraft.net/skin/" + player.getName() + ".png";
 		String filename = tilepath + player.getName() + ".png";