From e1fc9908b3c712fc1b97cc6e7a17eb1ed7f89886 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Wed, 9 Sep 2020 00:51:32 +0200
Subject: [PATCH] Fixes #4693: Fix color applicator not working on cable-buses.

---
 .../items/tools/powered/ColorApplicatorItem.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
index d0e0c28ac..4ad14e5be 100644
--- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
+++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
@@ -324,21 +324,21 @@ public class ColorApplicatorItem extends AEBasePoweredItem
             return w.setBlockState(pos, newState);
         }
 
+        if (blk instanceof CableBusBlock && p != null) {
+            return ((CableBusBlock) blk).recolorBlock(w, pos, side, newColor.dye, p);
+        }
+
         TileEntity be = w.getTileEntity(pos);
         if (be instanceof IColorableTile) {
             IColorableTile ct = (IColorableTile) be;
             AEColor c = ct.getColor();
             if (c != newColor) {
-                ct.recolourBlock(side, newColor, null);
+                ct.recolourBlock(side, newColor, p);
                 return true;
             }
             return false;
         }
 
-        if (blk instanceof CableBusBlock && p != null) {
-            return ((CableBusBlock) blk).recolorBlock(w, pos, side, newColor.dye, p);
-        }
-
         return false;
     }