From c05dd7ea0f9ea3349f8c7555ef9e157a2da0f6ed Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Sun, 6 Mar 2016 20:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E5=88=B0Lo?=
 =?UTF-8?q?cation=E4=B8=BAnull=E7=9A=84=E9=97=AE=E9=A2=98...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <jtb1@163.com>
---
 src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java b/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java
index 678d8ec..3b45f1e 100644
--- a/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java
+++ b/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java
@@ -222,6 +222,9 @@ public class ContainerShop implements Shop {
      *         null if this shop is not attached to another.
      */
     public ContainerShop getAttachedShop() {
+        if (this.getLocation() != null) {
+            return null;
+        }
         final Block c = Util.getSecondHalf(this.getLocation().getBlock());
         if (c == null) {
             return null;