Workaround CraftBukkit bug causing BlockSpreadEvent to report air.

EngineHub · May 21, 2019 · 4b320ab · 4b320ab
1 parent f516999
commit 4b320ab
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...rd-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java b/...rd-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java
@@ -563,9 +563,9 @@ public void onBlockSpread(BlockSpreadEvent event) {
             return;
         }
 
-        Material fromType = event.getSource().getType();
+        Material newType = event.getNewState().getType(); // craftbukkit randomly gives AIR as event.getSource even if that block is not air
 
-        if (Materials.isMushroom(fromType)) {
+        if (Materials.isMushroom(newType)) {
             if (wcfg.disableMushroomSpread) {
                 event.setCancelled(true);
                 return;
@@ -577,7 +577,7 @@ public void onBlockSpread(BlockSpreadEvent event) {
             }
         }
 
-        if (fromType == Material.GRASS_BLOCK) {
+        if (newType == Material.GRASS_BLOCK) {
             if (wcfg.disableGrassGrowth) {
                 event.setCancelled(true);
                 return;
@@ -589,7 +589,7 @@ public void onBlockSpread(BlockSpreadEvent event) {
             }
         }
 
-        if (fromType == Material.MYCELIUM) {
+        if (newType == Material.MYCELIUM) {
             if (wcfg.disableMyceliumSpread) {
                 event.setCancelled(true);
                 return;
@@ -602,7 +602,7 @@ public void onBlockSpread(BlockSpreadEvent event) {
             }
         }
 
-        if (fromType == Material.VINE || fromType == Material.KELP) {
+        if (newType == Material.VINE || newType == Material.KELP) {
             if (wcfg.disableVineGrowth) {
                 event.setCancelled(true);
                 return;