From abc81b93ed4116b7e9b31f79589345aa66ab6934 Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Fri, 15 Jan 2016 21:22:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84Location=E4=B8=BANull=E7=9A=84=E9=94=99=E8=AF=AF...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java b/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java
index 7e3df86..678d8ec 100644
--- a/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java
+++ b/src/main/java/org/maxgamer/QuickShop/Shop/ContainerShop.java
@@ -695,8 +695,14 @@ public class ContainerShop implements Shop {
                 this.displayItem = null;
                 return;
             }
+            if (this.getLocation().getWorld() == null) {
+                return;// Ignore if world not loaded...
+            }
             final DisplayItem disItem = this.getDisplayItem();
             final Location dispLoc = disItem.getDisplayLocation();
+            if (dispLoc.getWorld() == null) {
+                return;
+            }
             if (dispLoc.getBlock() != null && dispLoc.getBlock().getType() == Material.WATER) { // Flowing
                 // water.Stationery water does not move items.
                 disItem.remove();