From dae0f19fcc3e09b20a3531a30447ead77fb53969 Mon Sep 17 00:00:00 2001
From: PhanaticD <javw.phanatic@gmail.com>
Date: Fri, 4 Jan 2019 06:24:55 -0500
Subject: [PATCH] some fixup for last commit

---
 src/com/projectkorra/projectkorra/GeneralMethods.java | 2 --
 src/com/projectkorra/projectkorra/PKListener.java     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/GeneralMethods.java b/src/com/projectkorra/projectkorra/GeneralMethods.java
index d5d7f361..027c3052 100644
--- a/src/com/projectkorra/projectkorra/GeneralMethods.java
+++ b/src/com/projectkorra/projectkorra/GeneralMethods.java
@@ -95,8 +95,6 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import static com.projectkorra.projectkorra.ability.ElementalAbility.isAir;
-
 public class GeneralMethods {
 
 	// Represents PlayerName, previously checked blocks, and whether they were true or false
diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java
index 4e6e4f56..63a99442 100644
--- a/src/com/projectkorra/projectkorra/PKListener.java
+++ b/src/com/projectkorra/projectkorra/PKListener.java
@@ -149,7 +149,7 @@ public class PKListener implements Listener {
 			if (ElementalAbility.isLava(fromblock)) {
 				event.setCancelled(!EarthPassive.canFlowFromTo(fromblock, toblock));
 			} else if (ElementalAbility.isWater(fromblock)) {
-				event.setCancelled(ElementalAbility.isAir(toblock.getType()));
+				event.setCancelled(WaterBubble.isAir(toblock));
 				if (!event.isCancelled()) {
 					event.setCancelled(!WaterManipulation.canFlowFromTo(fromblock, toblock));
 				}