Merge branch 'development'

- Fixed shops not saving properly when moved across worlds

Author: DosMike

src/main/java/de/dosmike/sponge/vshop/VillagerShops.java

@@ -56,7 +56,7 @@
 import java.util.zip.ZipOutputStream;
 
 @SuppressWarnings("UnstableApiUsage")
-@Plugin(id = "vshop", name = "VillagerShops", version = "2.8.2")
+@Plugin(id = "vshop", name = "VillagerShops", version = "2.8.3")
 public class VillagerShops {
 
 	public static final Random rng = new Random(System.currentTimeMillis());

src/main/java/de/dosmike/sponge/vshop/shops/ShopEntity.java

@@ -70,8 +70,14 @@ public Location<World> getLocation() {
 	}
 
 	public void setLocation(Location<World> location) {
+		UUID oldExtent = this.location == null ? null : this.location.getExtent().getUniqueId();
+		UUID newExtent = location.getExtent().getUniqueId();
+
 		this.location = Utilities.centerOnBlock(location);
-		VillagerShops.getInstance().markShopsDirty(this);
+
+		if (oldExtent != null && !oldExtent.equals(newExtent))
+			VillagerShops.getInstance().markShopsDirty(oldExtent);
+		VillagerShops.getInstance().markShopsDirty(newExtent);
 	}
 
 	/**
@@ -86,10 +92,16 @@ public void move(Location<World> newLocation) {
 			if (!chunk.loadChunk(false))
 				throw new RuntimeException("Unable to load chunk for shop to remove old entity");
 		}
+		UUID oldExtent = location == null ? null : location.getExtent().getUniqueId();
+		UUID newExtent = newLocation.getExtent().getUniqueId();
+
 		Location<World> targetLocation = Utilities.centerOnBlock(newLocation);
 		getEntity().ifPresent(le -> le.setLocation(targetLocation));
 		location = targetLocation;
-		VillagerShops.getInstance().markShopsDirty(this);
+
+		if (oldExtent != null && !oldExtent.equals(newExtent))
+			VillagerShops.getInstance().markShopsDirty(oldExtent);
+		VillagerShops.getInstance().markShopsDirty(newExtent);
 	}
 
 	public Vector3d getRotation() {

src/main/resources/mcmod.info

@@ -2,7 +2,7 @@
   "modid": "vshop",
   "name": "VillagerShops",
   "description": "Set up Mobs of any type as admin shop. Shops will use a Inventory-Menu to buy/sell items",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "url": "https://github.com/DosMike/VillagerShops",
   "authorList": [ "DosMike" ],
   "useDependencyInformation": "true",