From ab20d359178738193d7d5093172692b50f8e0c43 Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Mon, 3 Aug 2015 08:08:51 -0500
Subject: [PATCH] Wipe personal server groups on restart of monitor.

Cleanup of unused code.
---
 .../src/mineplex/core/pet/PetManager.java     | 10 ----------
 .../core/pet/repository/PetRepository.java    | 15 ---------------
 .../mineplex/servermonitor/ServerMonitor.java | 19 ++++++++++++++++++-
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
index bb9d4c7f7..747fed442 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
@@ -205,16 +205,6 @@ public class PetManager extends MiniClientPlugin<PetClient>
 			((Villager) pet).setBaby();
 			((Villager) pet).setAgeLock(true);
 		}
-		/*
-		else if (pet instanceof Sheep)
-		{
-			DisguiseWither disguise = new DisguiseWither(pet);
-			disguise.s(350);
-
-			_disguiseManager.disguise(disguise);
-			UtilEnt.silence(pet, true);
-		}
-		*/
 		
 		_activePetOwners.put(player.getName(), pet);
 		_failedAttempts.put(player.getName(), 0);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
index 344f4f165..a206881ff 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
@@ -19,11 +19,6 @@ public class PetRepository
 		_webAddress = webAddress;
 	}
 
-	public List<PetSalesToken> GetPets(List<PetSalesToken> petTokens)
-	{
-		return new JsonWebCall(_webAddress + "Pets/GetPets").Execute(new TypeToken<List<PetSalesToken>>(){}.getType(), petTokens);
-	}
-
 	public void AddPet(PetChangeToken token)
 	{
 		new AsyncJsonWebCall(_webAddress + "Pets/AddPet").Execute(token);
@@ -43,14 +38,4 @@ public class PetRepository
 	{
 		new AsyncJsonWebCall(_webAddress + "Pets/UpdatePet").Execute(token);
 	}
-
-	public void AddPetNameTag(String name)
-	{
-		new AsyncJsonWebCall(_webAddress + "Pets/AddPetNameTag").Execute(name);
-	}
-
-	public void RemovePetNameTag(String name)
-	{
-		new AsyncJsonWebCall(_webAddress + "Pets/RemovePetNameTag").Execute(name);
-	}
 }
diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
index d15de614e..0cb7fa5b0 100644
--- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
+++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
@@ -180,9 +180,26 @@ public class ServerMonitor
 				log("Saved Dedicated Server Stats.");
 				_historyRepository.saveServerGroupStats((int)totalCPU, (int)totalRAM, _serverGroupMap.values());
 				log("Saved ServerGroup Stats.");
-				//_historyRepository.saveNetworkStats(usedCpuPercent, usedRamPercent, availableCPU, availableRAM, _region);
+				_historyRepository.saveNetworkStats(usedCpuPercent, usedRamPercent, availableCPU, availableRAM, _region);
 				log("Saved Network Stats.");
 				
+				if (_count == 0)
+				{
+					for (Iterator<ServerGroup> groupStatusIterator = _serverGroups.iterator(); groupStatusIterator.hasNext();)
+					{
+						ServerGroup groupStatus = groupStatusIterator.next();
+						
+						if (groupStatus.getServerType().equalsIgnoreCase("Player"))
+						{
+							_repository.removeServerGroup(groupStatus);
+							_serverGroupMap.remove(groupStatus);
+							groupStatusIterator.remove();
+							
+							System.out.println("Removed MPS : " + groupStatus.getName());
+						}
+					}
+				}
+				
 				for (ServerGroup groupStatus : _serverGroups)
 				{
 					NautHashMap<Integer, MinecraftServer> serverMap = new NautHashMap<Integer, MinecraftServer>();