From 7c3c8403b2a97a93003a1baa89a3705317c7d782 Mon Sep 17 00:00:00 2001
From: Samuel Sandeen <samuelesandeen@gmail.com>
Date: Tue, 13 Sep 2016 20:51:09 -0400
Subject: [PATCH] Fix Skybinder Staff

---
 .../src/mage/sets/gatecrash/SkyblinderStaff.java  | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java b/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java
index 0e76f4aa2b..13fa32e721 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SkyblinderStaff.java
@@ -85,22 +85,13 @@ class CantBeBlockedByCreaturesWithFlyingAttachedEffect extends RestrictionEffect
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        Permanent attachment = game.getPermanent(source.getSourceId());
-        if (attachment != null && attachment.getAttachedTo() != null) {
-            Permanent perm = game.getPermanent(attachment.getAttachedTo());
-            if (perm != null) {
-                return true;
-            }
-        }
-        return false;
+        return game.getPermanent(source.getSourceId()) != null
+                && permanent.getAttachments().contains(source.getSourceId());
     }
 
     @Override
     public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) {
-        if (blocker.getAbilities().contains(FlyingAbility.getInstance())) {
-            return false;
-        }
-        return true;
+        return !this.applies(attacker, source, game) || !blocker.getAbilities().contains(FlyingAbility.getInstance());
     }
 
     @Override