fix some encoding issues for §

Don't attempt to close on null objects

2 files changed, 5 insertions, 3 deletions

diff --git a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
index c1826d9ef..816262a8e 100644
--- a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
+++ b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
@@ -180,7 +180,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE
 		acquireReadLock();
 		try
 		{
-			return getData().getNewPlayerAnnouncement().replace('&', '�').replace("��", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString());
+			return getData().getNewPlayerAnnouncement().replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString());
 		}
 		finally
 		{
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java b/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java
index 8c8b7faca..a8a8598d1 100644
--- a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java
+++ b/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java
@@ -85,9 +85,9 @@ public class TextInput implements IText
 						if (line.length() > 0 && line.charAt(0) == '#')
 						{
 							bookmarks.put(line.substring(1).toLowerCase(Locale.ENGLISH).replaceAll("&[0-9a-fk]", ""), lineNumber);
-							chapters.add(line.substring(1).replace('&', '�').replace("�", "&"));
+							chapters.add(line.substring(1).replace('&', '§').replace("§", "&"));
 						}
-						lines.add(line.replace('&', '�').replace("�", "&"));
+						lines.add(line.replace('&', '§').replace("§", "&"));
 						lineNumber++;
 					}
 				}
@@ -119,7 +119,9 @@ public class TextInput implements IText
 				}
 				finally
 				{
+                    if(output != null)
 					output.close();
+                    if(input != null)
 					input.close();
 				}
 				throw new FileNotFoundException("File " + filename + ".txt does not exist. Creating one for you.");