From eb23a25eb5b7f1273b97bb7c2d61d1f1b398fe24 Mon Sep 17 00:00:00 2001
From: Sam <huzzahpinkyoshi@gmail.com>
Date: Mon, 10 Sep 2018 16:46:22 +0100
Subject: [PATCH] Fix a bunch of bugs

---
 .../mineplex/core/friend/FriendManager.java   |  4 +--
 .../core/friend/ui/FriendMainPage.java        |  2 +-
 .../games/speedbuilders/SpeedBuilders.java    |  7 ++---
 .../arcade/game/modules/MapCrumbleModule.java | 27 +++----------------
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
index e050117b1..b87ab5885 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
@@ -586,7 +586,7 @@ public class FriendManager extends MiniDbClientPlugin<List<FriendStatus>>
 						pending++;
 						break;
 					case Accepted:
-						if (!friend.Online)
+						if (!friend.isOnline())
 						{
 							offline++;
 						}
@@ -612,7 +612,7 @@ public class FriendManager extends MiniDbClientPlugin<List<FriendStatus>>
 
 			if (compress)
 			{
-				if (type != FriendStatusType.Accepted || !friend.Online)
+				if (type != FriendStatusType.Accepted || !friend.isOnline())
 				{
 					continue;
 				}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendMainPage.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendMainPage.java
index f8569add2..23dfdee42 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendMainPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendMainPage.java
@@ -88,7 +88,7 @@ public class FriendMainPage extends ShopPageBase<FriendManager, FriendShop>
 				{
 					playAcceptSound(player);
 					_pageType = pageType;
-					refresh();
+					_pageManager.setPage(0);
 				}
 			});
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java
index 99d8c181c..ee1c38391 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java
@@ -669,15 +669,12 @@ public class SpeedBuilders extends SoloGame
 
 	public void checkPerfectBuild(Player player)
 	{
-		if (_perfectBuild.containsKey(player))
-			return;
-		
 		Manager.runSyncLater(() ->
 		{
-			if (!IsLive() || !_buildRecreations.containsKey(player) || _perfectBuild.containsKey(player))
+			if (!IsLive() || _state != SpeedBuildersState.BUILDING || !_buildRecreations.containsKey(player) || _perfectBuild.containsKey(player))
 			{
 				return;
-			};
+			}
 
 			if (_buildRecreations.get(player).calculateScoreFromBuild(_currentBuild) == _currentBuild.getPerfectScore())
 			{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/MapCrumbleModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/MapCrumbleModule.java
index c4d1a4c0f..f54ab50cf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/MapCrumbleModule.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/MapCrumbleModule.java
@@ -64,7 +64,7 @@ public class MapCrumbleModule extends Module
 					{
 						Block block = world.getBlockAt(x, y, z);
 
-						if (block.getType() != Material.AIR && !block.isLiquid())
+						if (block.getType() != Material.AIR)
 						{
 							_worldBlocks.add(block);
 						}
@@ -194,36 +194,15 @@ public class MapCrumbleModule extends Module
 		}
 	}
 
-	@EventHandler(priority = EventPriority.MONITOR)
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void blockPlace(BlockPlaceEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-
 		addWorldBlock(event.getBlock());
 	}
 
-	@EventHandler(priority = EventPriority.MONITOR)
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void blockPlace(BlockBreakEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-
 		_worldBlocks.remove(event.getBlock());
 	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void blockPhysics(BlockPhysicsEvent event)
-	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-
-		addWorldBlock(event.getBlock());
-	}
 }