From a77b682945e1e98dfcc7d7e35e65419356746769 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Mon, 1 Feb 2016 15:08:04 -0600
Subject: [PATCH] Fixed 35 FindBugs errors

---
 .../ClientVerifyAndLockNameResponse.java      |  5 +-
 .../zone/PlanetTravelPointListResponse.java   |  4 +-
 .../swg/zone/ServerWeatherMessage.java        |  6 +--
 .../AuctionQueryHeadersResponseMessage.java   |  2 +-
 src/resources/Location.java                   | 16 +++---
 src/resources/Terrain.java                    |  6 +--
 src/resources/client_info/ServerFactory.java  | 15 ++++--
 .../visitors/ProfTemplateData.java            |  2 +-
 .../visitors/SlotDefinitionData.java          | 54 ++++++++++---------
 .../visitors/SlotDescriptorData.java          |  2 +-
 src/resources/collections/SWGMap.java         |  7 +++
 src/resources/collections/SWGSet.java         |  9 +++-
 .../callbacks/FindFriendCallback.java         |  5 +-
 .../commands/callbacks/ServerCmdCallback.java |  2 +-
 .../callbacks/WaypointCmdCallback.java        |  8 ++-
 src/resources/common/BCrypt.java              |  2 +-
 .../containers/ContainerPermissions.java      |  9 +++-
 .../encodables/OutOfBandPackage.java          | 10 ++++
 src/resources/encodables/player/Mail.java     |  1 +
 src/resources/server_info/DataManager.java    |  2 +
 src/services/group/GroupInviterData.java      |  6 +--
 src/services/map/MappingTemplate.java         | 10 +++-
 .../objects/quadtree/TestQuadTree.java        | 12 +----
 test/resources/services/TestConfig.java       |  2 +-
 24 files changed, 117 insertions(+), 80 deletions(-)

diff --git a/src/network/packets/swg/login/creation/ClientVerifyAndLockNameResponse.java b/src/network/packets/swg/login/creation/ClientVerifyAndLockNameResponse.java
index 501d0d8dd..e4abe3749 100644
--- a/src/network/packets/swg/login/creation/ClientVerifyAndLockNameResponse.java
+++ b/src/network/packets/swg/login/creation/ClientVerifyAndLockNameResponse.java
@@ -28,6 +28,7 @@
 package network.packets.swg.login.creation;
 
 import java.nio.ByteBuffer;
+import java.util.Locale;
 
 import network.packets.swg.SWGPacket;
 
@@ -53,7 +54,7 @@ public class ClientVerifyAndLockNameResponse extends SWGPacket {
 		name = getUnicode(data);
 		getAscii(data); // ui
 		getInt(data);
-		error = ErrorMessage.valueOf(getAscii(data).toUpperCase());
+		error = ErrorMessage.valueOf(getAscii(data).toUpperCase(Locale.US));
 	}
 	
 	public ByteBuffer encode() {
@@ -63,7 +64,7 @@ public class ClientVerifyAndLockNameResponse extends SWGPacket {
 		addUnicode(data, name);
 		addAscii(  data, "ui");
 		addInt(    data, 0);
-		addAscii(  data, error.name().toLowerCase());
+		addAscii(  data, error.name().toLowerCase(Locale.US));
 		return data;
 	}
 	
diff --git a/src/network/packets/swg/zone/PlanetTravelPointListResponse.java b/src/network/packets/swg/zone/PlanetTravelPointListResponse.java
index 8a995c20f..9f0d3b396 100644
--- a/src/network/packets/swg/zone/PlanetTravelPointListResponse.java
+++ b/src/network/packets/swg/zone/PlanetTravelPointListResponse.java
@@ -80,9 +80,7 @@ public class PlanetTravelPointListResponse extends SWGPacket {
 	}
 	
 	private boolean isStarport(String pointName) {
-		boolean result = pointName.endsWith(" Starport") || pointName.endsWith(" Spaceport");
-		
-		return result || (pointName.split(" ").length == 2 && !result);
+		return pointName.endsWith(" Starport") || pointName.endsWith(" Spaceport") || pointName.split(" ").length == 2;
 	}
 	
 	private int calculateSize() {
diff --git a/src/network/packets/swg/zone/ServerWeatherMessage.java b/src/network/packets/swg/zone/ServerWeatherMessage.java
index a6651768b..dbe9b13d2 100644
--- a/src/network/packets/swg/zone/ServerWeatherMessage.java
+++ b/src/network/packets/swg/zone/ServerWeatherMessage.java
@@ -44,10 +44,10 @@ public class ServerWeatherMessage extends SWGPacket {
 	public void decode(ByteBuffer data) {
 		if (!super.decode(data, CRC))
 			return;
-		WeatherType type = WeatherType.CLEAR;
 		
-		switch(getInt(data)) {
+		switch (getInt(data)) {
 			case 0:
+			default:
 				type = WeatherType.CLEAR;
 				break;
 			case 1:
@@ -61,8 +61,6 @@ public class ServerWeatherMessage extends SWGPacket {
 				break;
 		}
 		
-		this.type = type;
-		
 		cloudVectorX = getFloat(data);
 		cloudVectorZ = getFloat(data);
 		cloudVectorY = getFloat(data);
diff --git a/src/network/packets/swg/zone/auction/AuctionQueryHeadersResponseMessage.java b/src/network/packets/swg/zone/auction/AuctionQueryHeadersResponseMessage.java
index 8264aed4e..919d504f8 100644
--- a/src/network/packets/swg/zone/auction/AuctionQueryHeadersResponseMessage.java
+++ b/src/network/packets/swg/zone/auction/AuctionQueryHeadersResponseMessage.java
@@ -74,7 +74,7 @@ public class AuctionQueryHeadersResponseMessage extends SWGPacket {
 			item.setObjectId(getLong(data));
 			getByte(data);
 			item.setPrice(getInt(data));
-			item.setExpireTime(getInt(data)*1000+System.currentTimeMillis());
+			item.setExpireTime(getInt(data)*1000L+System.currentTimeMillis());
 			if (getInt(data) != item.getPrice())
 				throw new IllegalStateException("I WAS LIED TO AT INDEX " + itemI);
 			item.setVuid(locations[getShort(data)]);
diff --git a/src/resources/Location.java b/src/resources/Location.java
index ce8b48efb..00c850778 100644
--- a/src/resources/Location.java
+++ b/src/resources/Location.java
@@ -165,15 +165,15 @@ public class Location implements Encodable, Serializable {
 	
 	public boolean mergeLocation(double lX, double lY, double lZ) {
 		boolean changed = false;
-		if (Double.isNaN(getX()) || getX() != lX) {
+		if (Double.isNaN(getX()) || !isEqual(getX(), lX)) {
 			setX(lX);
 			changed = true;
 		}
-		if (Double.isNaN(getY()) || getY() != lY) {
+		if (Double.isNaN(getY()) || !isEqual(getY(), lY)) {
 			setY(lY);
 			changed = true;
 		}
-		if (Double.isNaN(getZ()) || getZ() != lZ) {
+		if (Double.isNaN(getZ()) || !isEqual(getZ(), lZ)) {
 			setZ(lZ);
 			changed = true;
 		}
@@ -186,19 +186,19 @@ public class Location implements Encodable, Serializable {
 		double oZ = getOrientationZ();
 		double oW = getOrientationW();
 		boolean changed = false;
-		if (!Double.isNaN(l.getOrientationX()) && (Double.isNaN(oX) || oX != l.getOrientationX())) {
+		if (!Double.isNaN(l.getOrientationX()) && (Double.isNaN(oX) || !isEqual(oX, l.getOrientationX()))) {
 			oX = l.getOrientationX();
 			changed = true;
 		}
-		if (!Double.isNaN(l.getOrientationY()) && (Double.isNaN(oY) || oY != l.getOrientationY())) {
+		if (!Double.isNaN(l.getOrientationY()) && (Double.isNaN(oY) || !isEqual(oY, l.getOrientationY()))) {
 			oY = l.getOrientationY();
 			changed = true;
 		}
-		if (!Double.isNaN(l.getOrientationZ()) && (Double.isNaN(oZ) || oZ != l.getOrientationZ())) {
+		if (!Double.isNaN(l.getOrientationZ()) && (Double.isNaN(oZ) || !isEqual(oZ, l.getOrientationZ()))) {
 			oZ = l.getOrientationZ();
 			changed = true;
 		}
-		if (!Double.isNaN(l.getOrientationW()) && (Double.isNaN(oW) || oW != l.getOrientationW())) {
+		if (!Double.isNaN(l.getOrientationW()) && (Double.isNaN(oW) || !isEqual(oW,  l.getOrientationW()))) {
 			oW = l.getOrientationW();
 			changed = true;
 		}
@@ -259,7 +259,7 @@ public class Location implements Encodable, Serializable {
 			return Double.isNaN(y);
 		if (Double.isNaN(y))
 			return false;
-		return x == y;
+		return Math.abs(x - y) <= 1E-7;
 	}
 
 	@Override
diff --git a/src/resources/Terrain.java b/src/resources/Terrain.java
index a1a761241..ddb4746a3 100644
--- a/src/resources/Terrain.java
+++ b/src/resources/Terrain.java
@@ -115,9 +115,9 @@ public enum Terrain {
 		for (Terrain p : values()) {
 			CRC_TO_TERRAIN.put(p.getCrc(), p);
 			CRC_TO_NAME.put(p.getCrc(), p.name());
-			NAME_TO_CRC.put(p.name().toLowerCase(), p.getCrc());
-			NAME_TO_CRC.put(p.name().toLowerCase(), p.getCrc());
-			NAME_TO_TERRAIN.put(p.name().toLowerCase(), p);
+			NAME_TO_CRC.put(p.name().toLowerCase(Locale.US), p.getCrc());
+			NAME_TO_CRC.put(p.name().toLowerCase(Locale.US), p.getCrc());
+			NAME_TO_TERRAIN.put(p.name().toLowerCase(Locale.US), p);
 		}
 	}
 	
diff --git a/src/resources/client_info/ServerFactory.java b/src/resources/client_info/ServerFactory.java
index 1352ccd47..79166da6c 100644
--- a/src/resources/client_info/ServerFactory.java
+++ b/src/resources/client_info/ServerFactory.java
@@ -40,12 +40,15 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 
 /**
  * Created by Waverunner on 6/9/2015
  */
 public final class ServerFactory extends DataFactory {
+	
+	private static final Object instanceMutex = new Object();
 	private static ServerFactory instance;
 
 	public static DatatableData getDatatable(String file) {
@@ -135,10 +138,10 @@ public final class ServerFactory extends DataFactory {
 						String columnType = columnTypes[i];
 						if (columnType.contains("[")) {
 							String[] split = columnType.split("\\[");
-							columnTypes[i] = split[0].toLowerCase();
+							columnTypes[i] = split[0].toLowerCase(Locale.US);
 							defaultValues.add(split[1].replace("]", ""));
 						} else {
-							columnTypes[i] = columnType.toLowerCase();
+							columnTypes[i] = columnType.toLowerCase(Locale.US);
 							defaultValues.add("");
 						}
 					}
@@ -209,8 +212,10 @@ public final class ServerFactory extends DataFactory {
 	}
 
 	public static ServerFactory getInstance() {
-		if (instance == null)
-			instance = new ServerFactory();
-		return instance;
+		synchronized (instanceMutex) {
+			if (instance == null)
+				instance = new ServerFactory();
+			return instance;
+		}
 	}
 }
diff --git a/src/resources/client_info/visitors/ProfTemplateData.java b/src/resources/client_info/visitors/ProfTemplateData.java
index 67badd99f..b98cd53c4 100644
--- a/src/resources/client_info/visitors/ProfTemplateData.java
+++ b/src/resources/client_info/visitors/ProfTemplateData.java
@@ -38,7 +38,7 @@ public class ProfTemplateData extends ClientData {
 	
 	private List<Template> templates = new ArrayList<>();
 	
-	private class Template {
+	private static class Template {
 		
 		private List<String> items;
 		private String template;
diff --git a/src/resources/client_info/visitors/SlotDefinitionData.java b/src/resources/client_info/visitors/SlotDefinitionData.java
index 94370866a..1c7313ec1 100644
--- a/src/resources/client_info/visitors/SlotDefinitionData.java
+++ b/src/resources/client_info/visitors/SlotDefinitionData.java
@@ -38,14 +38,27 @@ public class SlotDefinitionData extends ClientData {
 
 	private Map<String, SlotDefinition> definitions = new HashMap<>();
 
-	public class SlotDefinition {
-		public String name;
-		public boolean isGlobal;
-		public boolean isModdable;
-		public boolean isExclusive;
-		public boolean hasHardpoint;
-		public String hardpointName;
-		public int unk1;
+	public static class SlotDefinition {
+		private String name;
+		private boolean isGlobal;
+		private boolean isModdable;
+		private boolean isExclusive;
+		private boolean hasHardpoint;
+		private String hardpointName;
+		
+		public String getName() { return name; }
+		public boolean isGlobal() { return isGlobal; }
+		public boolean isModdable() { return isModdable; }
+		public boolean isExclusive() { return isExclusive; }
+		public boolean hasHardpoint() { return hasHardpoint; }
+		public String getHardpointName() { return hardpointName; }
+		
+		public void setName(String name) { this.name = name; }
+		public void setGlobal(boolean isGlobal) { this.isGlobal = isGlobal; }
+		public void setModdable(boolean isModdable) { this.isModdable = isModdable; }
+		public void setExclusive(boolean isExclusive) { this.isExclusive = isExclusive; }
+		public void setHasHardpoint(boolean hasHardpoint) { this.hasHardpoint = hasHardpoint; }
+		public void setHardpointName(String hardpointName) { this.hardpointName = hardpointName; }
 	}
 
 	@Override
@@ -55,22 +68,15 @@ public class SlotDefinitionData extends ClientData {
 		data.readChunk((chunk) -> {
 			SlotDefinition def = new SlotDefinition();
 
-			def.name = chunk.readString();
-			def.isGlobal = chunk.readBoolean();
-			def.isModdable = chunk.readBoolean();
-			def.isExclusive = chunk.readBoolean();
-			def.hasHardpoint = chunk.readBoolean();
-
-			if (def.hasHardpoint) {
-				if (chunk.readByte() != 0) {
-					chunk.skip(-1);
-					def.hardpointName = chunk.readString();
-				}
-			} else {
-				chunk.readByte();
-			}
-
-			def.unk1 = chunk.readInt(); // This seems to be a couple more booleans together, not sure what they would represent.
+			def.setName(chunk.readString());
+			def.setGlobal(chunk.readBoolean());
+			def.setModdable(chunk.readBoolean());
+			def.setExclusive(chunk.readBoolean());
+			def.setHasHardpoint(chunk.readBoolean());
+			def.setHardpointName(chunk.readString());
+			chunk.readBoolean(); // "combat bone"
+			chunk.readBoolean(); // "observe with parent"
+			chunk.readBoolean(); // "expose with parent"
 
 			definitions.put(def.name, def);
 		});
diff --git a/src/resources/client_info/visitors/SlotDescriptorData.java b/src/resources/client_info/visitors/SlotDescriptorData.java
index bfe9cc30f..2cc57f9f8 100644
--- a/src/resources/client_info/visitors/SlotDescriptorData.java
+++ b/src/resources/client_info/visitors/SlotDescriptorData.java
@@ -45,7 +45,7 @@ public class SlotDescriptorData extends ClientData {
 		IffNode chunk = iff.enterChunk("DATA");
 
 		String slot;
-		while((slot = chunk.readString()) != null && !slot.isEmpty()) {
+		while (!(slot = chunk.readString()).isEmpty()) {
 			slots.add(slot);
 		}
 
diff --git a/src/resources/collections/SWGMap.java b/src/resources/collections/SWGMap.java
index a7aa542c8..1547a01aa 100644
--- a/src/resources/collections/SWGMap.java
+++ b/src/resources/collections/SWGMap.java
@@ -33,6 +33,8 @@ import resources.player.PlayerState;
 import utilities.Encoder;
 import utilities.Encoder.StringType;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -74,6 +76,11 @@ public class SWGMap<K, V> extends AbstractMap<K, V> implements Encodable, Serial
 		this.strType = strType;
 	}
 	
+	private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+		ois.defaultReadObject();
+		updateCount = 0;
+	}
+	
 	@Override
 	public V get(Object key) {
 		return map.get(key);
diff --git a/src/resources/collections/SWGSet.java b/src/resources/collections/SWGSet.java
index 99060d05e..184666a0d 100644
--- a/src/resources/collections/SWGSet.java
+++ b/src/resources/collections/SWGSet.java
@@ -35,6 +35,8 @@ import resources.player.PlayerState;
 import utilities.Encoder;
 import utilities.Encoder.StringType;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -86,7 +88,12 @@ public class SWGSet<E> extends AbstractSet<E> implements Encodable, Serializable
 		this(view, updateType);
 		this.strType = strType;
 	}
-
+	
+	private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+		ois.defaultReadObject();
+		updateCount = 0;
+	}
+	
 	@Override
 	public boolean add(E e) {
 		if (!set.add(e))
diff --git a/src/resources/commands/callbacks/FindFriendCallback.java b/src/resources/commands/callbacks/FindFriendCallback.java
index 5782acaf0..0f87a8b79 100644
--- a/src/resources/commands/callbacks/FindFriendCallback.java
+++ b/src/resources/commands/callbacks/FindFriendCallback.java
@@ -38,6 +38,7 @@ import resources.player.Player;
 import resources.player.PlayerState;
 import services.galaxy.GalacticManager;
 
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -51,7 +52,7 @@ public class FindFriendCallback implements ICmdCallback {
 		if (ghost == null || args.isEmpty())
 			return;
 
-		String friendName = args.split(" ")[0].toLowerCase();
+		String friendName = args.split(" ")[0].toLowerCase(Locale.US);
 
 		if (!ghost.getFriendsList().contains(friendName)) {
 			new ChatBroadcastIntent(player, "@ui_cmnty:friend_location_failed_noname").broadcast();
@@ -65,7 +66,7 @@ public class FindFriendCallback implements ICmdCallback {
 		}
 
 		PlayerObject friendGhost = friend.getPlayerObject();
-		if (friendGhost == null || !friendGhost.getFriendsList().contains(player.getCharacterName().split(" ")[0].toLowerCase())) {
+		if (friendGhost == null || !friendGhost.getFriendsList().contains(player.getCharacterName().split(" ")[0].toLowerCase(Locale.US))) {
 			new ChatBroadcastIntent(player, new ProsePackage("@ui_cmnty:friend_location_failed", "TU", friendName)).broadcast();
 			return;
 		}
diff --git a/src/resources/commands/callbacks/ServerCmdCallback.java b/src/resources/commands/callbacks/ServerCmdCallback.java
index 56291afd2..8e7b0bd24 100644
--- a/src/resources/commands/callbacks/ServerCmdCallback.java
+++ b/src/resources/commands/callbacks/ServerCmdCallback.java
@@ -142,7 +142,7 @@ public class ServerCmdCallback implements ICmdCallback {
 			});
 			
 			timeWindow.addOkButtonCallback("handleCustomShutdownCountdown", (player, actor1, event, parameters) -> {
-				long countdown = Long.valueOf(SuiInputBox.getEnteredText(parameters));
+				long countdown = Long.parseLong(SuiInputBox.getEnteredText(parameters));
 				new ServerManagementIntent(countdown, timeUnitReference.get(), ServerManagementEvent.SHUTDOWN).broadcast();
 			});
 			
diff --git a/src/resources/commands/callbacks/WaypointCmdCallback.java b/src/resources/commands/callbacks/WaypointCmdCallback.java
index e233e1d88..dbff9a8c4 100644
--- a/src/resources/commands/callbacks/WaypointCmdCallback.java
+++ b/src/resources/commands/callbacks/WaypointCmdCallback.java
@@ -66,11 +66,9 @@ public class WaypointCmdCallback implements ICmdCallback {
 						try {
 							if (cmdArgs.length > 2) {
 								x = Float.parseFloat(cmdArgs[1]);
-								if (cmdArgs.length >= 3) {
-									z = Float.parseFloat(cmdArgs[2]); // Just to be sure.. Maybe someone wanted some numbers in the name.
-									if (cmdArgs.length != 6)
-										cmdArgs = args.split(" ", 6);
-								}
+								z = Float.parseFloat(cmdArgs[2]); // Just to be sure.. Maybe someone wanted some numbers in the name.
+								if (cmdArgs.length != 6)
+									cmdArgs = args.split(" ", 6);
 							}
 						} catch (NumberFormatException e) {
 							// This is just a named waypoint.
diff --git a/src/resources/common/BCrypt.java b/src/resources/common/BCrypt.java
index 3a4d7b456..b8e0569dc 100644
--- a/src/resources/common/BCrypt.java
+++ b/src/resources/common/BCrypt.java
@@ -424,7 +424,7 @@ public class BCrypt {
 	 * @return	the decoded value of x
 	 */
 	private static byte char64(char x) {
-		if ((int)x < 0 || (int)x > index_64.length)
+		if ((int)x > index_64.length)
 			return -1;
 		return index_64[(int)x];
 	}
diff --git a/src/resources/containers/ContainerPermissions.java b/src/resources/containers/ContainerPermissions.java
index b411cc595..312580634 100644
--- a/src/resources/containers/ContainerPermissions.java
+++ b/src/resources/containers/ContainerPermissions.java
@@ -160,8 +160,13 @@ public abstract class ContainerPermissions implements Serializable {
 		}
 
 		public static int valueOf(EnumSet<Permission> bitmaskSet) {
-			Permission[] permissions = bitmaskSet.toArray(new Permission[0]);
-			return valueOf(permissions);
+			int value = 0;
+
+			for (Permission permission : bitmaskSet) {
+				value += permission.bitmask;
+			}
+
+			return value;
 		}
 
 		public static int valueOf(Permission... permissions) {
diff --git a/src/resources/encodables/OutOfBandPackage.java b/src/resources/encodables/OutOfBandPackage.java
index 08e810f91..9341da5db 100644
--- a/src/resources/encodables/OutOfBandPackage.java
+++ b/src/resources/encodables/OutOfBandPackage.java
@@ -30,6 +30,8 @@ package resources.encodables;
 import network.packets.Packet;
 import resources.objects.waypoint.WaypointObject;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -47,12 +49,20 @@ public class OutOfBandPackage implements Encodable, Serializable {
 
 	public OutOfBandPackage() {
 		packages = new ArrayList<>(5);
+		data = null;
+		dataSize = 0;
 	}
 
 	public OutOfBandPackage(OutOfBandData... outOfBandData) {
 		this();
 		Collections.addAll(packages, outOfBandData);
 	}
+	
+	private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+		ois.defaultReadObject();
+		data = null;
+		dataSize = 0;
+	}
 
 	public List<OutOfBandData> getPackages() {
 		return packages;
diff --git a/src/resources/encodables/player/Mail.java b/src/resources/encodables/player/Mail.java
index 6036eb706..92c648128 100644
--- a/src/resources/encodables/player/Mail.java
+++ b/src/resources/encodables/player/Mail.java
@@ -58,6 +58,7 @@ public class Mail implements Encodable, Serializable {
 		this.message = message;
 		this.receiverId = receiverId;
 		this.status = NEW;
+		this.outOfBandPackage = null;
 	}
 
 	public int getId() {
diff --git a/src/resources/server_info/DataManager.java b/src/resources/server_info/DataManager.java
index f95bf491c..c53bbeb05 100644
--- a/src/resources/server_info/DataManager.java
+++ b/src/resources/server_info/DataManager.java
@@ -175,6 +175,8 @@ public class DataManager implements IntentReceiver {
 
 	@Override
 	public void onIntentReceived(Intent i) {
+		if (!(i instanceof ConfigChangedIntent))
+			return;
 		ConfigChangedIntent cci = (ConfigChangedIntent) i;
 		boolean log = Boolean.valueOf(cci.getNewValue());
 
diff --git a/src/services/group/GroupInviterData.java b/src/services/group/GroupInviterData.java
index 065f304c3..b1df0f2fd 100644
--- a/src/services/group/GroupInviterData.java
+++ b/src/services/group/GroupInviterData.java
@@ -31,15 +31,13 @@ import network.packets.Packet;
 import resources.encodables.Encodable;
 import resources.player.Player;
 
-import java.io.Serializable;
 import java.nio.ByteBuffer;
 
 /**
  * Created by Waverunner on 10/4/2015
  */
-public class GroupInviterData implements Encodable, Serializable {
-	private static final long serialVersionUID = 1L;
-
+public class GroupInviterData implements Encodable {
+	
 	private long id;
 	private Player sender;
 	private String name;
diff --git a/src/services/map/MappingTemplate.java b/src/services/map/MappingTemplate.java
index f5ee15524..7f7bd7d93 100644
--- a/src/services/map/MappingTemplate.java
+++ b/src/services/map/MappingTemplate.java
@@ -31,6 +31,7 @@ package services.map;
  * Created by Waverunner on 6/1/2015
  */
 public class MappingTemplate {
+	
 	private String template;
 	private String name;
 	private String category;
@@ -38,7 +39,14 @@ public class MappingTemplate {
 	private int type;
 	private int flag;
 
-	public MappingTemplate() {}
+	public MappingTemplate() {
+		template = null;
+		name = null;
+		category = null;
+		subcategory = null;
+		type = 0;
+		flag = 0;
+	}
 
 	public String getTemplate() {
 		return template;
diff --git a/test/resources/objects/quadtree/TestQuadTree.java b/test/resources/objects/quadtree/TestQuadTree.java
index 443546cd7..28b86214b 100644
--- a/test/resources/objects/quadtree/TestQuadTree.java
+++ b/test/resources/objects/quadtree/TestQuadTree.java
@@ -68,7 +68,7 @@ public class TestQuadTree {
 	@Test
 	public void testDuplicatesBug() {
 		QuadTree<Double> tree = new QuadTree<Double>(2, 0, 0, 10, 10);
-		Double d = new Double(5.0);
+		Double d = Double.valueOf(5.0);
 		tree.put(5.0, 5.0, d);
 		Assert.assertEquals(1, tree.getWithinRange(5.0, 5.0, 10).size());
 		Assert.assertEquals(tree.getIgnoreCollisions(5.0, 5.0), d);
@@ -156,14 +156,6 @@ public class TestQuadTree {
 			inter = intersects(minX, minY, maxX, maxY, x, y, range);
 			Assert.assertEquals("Failed at ("+x+", "+y+")", actual, inter);
 		}
-		long start = System.nanoTime();
-		for (int i = 0; i < 1000000; i++) {
-			double x = Math.random() * 10;
-			double y = Math.random() * 10;
-			intersects(minX, minY, maxX, maxY, x, y, range);
-		}
-		long end = System.nanoTime();
-		System.out.printf("Time per intersect: %.10fms%n", (end-start)/1E6/1000000);
 	}
 	
 	@Test
@@ -233,7 +225,7 @@ public class TestQuadTree {
 		return x * x;
 	}
 	
-	private class Point2D {
+	private static class Point2D {
 		private double x;
 		private double y;
 		public Point2D(double x, double y) {
diff --git a/test/resources/services/TestConfig.java b/test/resources/services/TestConfig.java
index 667625835..6e95e8a46 100644
--- a/test/resources/services/TestConfig.java
+++ b/test/resources/services/TestConfig.java
@@ -56,7 +56,7 @@ public class TestConfig {
 		c.save();
 		c.load();
 		Assert.assertTrue(c.getBoolean("TEST-VALUE", false));
-		file.delete();
+		Assert.assertTrue(file.delete());
 	}
 	
 }