Fix AdminShops not being immune to natural causes.

build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'eclipse'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
-version = '1.7c'
+version = '1.8'
 group = "io.github.hsyyid"
 archivesBaseName = "AdminShop"
 

src/main/java/io/github/hsyyid/adminshop/AdminShop.java

@@ -6,8 +6,8 @@
 import io.github.hsyyid.adminshop.cmdexecutors.SetShopExecutor;
 import io.github.hsyyid.adminshop.config.Config;
 import io.github.hsyyid.adminshop.config.ShopConfig;
-import io.github.hsyyid.adminshop.listeners.PlayerBreakBlockListener;
-import io.github.hsyyid.adminshop.listeners.PlayerInteractBlockListener;
+import io.github.hsyyid.adminshop.listeners.BreakBlockListener;
+import io.github.hsyyid.adminshop.listeners.InteractBlockListener;
 import io.github.hsyyid.adminshop.utils.ConfigManager;
 import io.github.hsyyid.adminshop.utils.Shop;
 import io.github.hsyyid.adminshop.utils.ShopModifier;
@@ -34,7 +34,7 @@
 import java.util.Set;
 import java.util.UUID;
 
-@Plugin(id = "io.github.hsyyid.adminshop", name = "AdminShop", description = "This plugin adds sign shops for users to buy items.", version = "1.7c")
+@Plugin(id = "io.github.hsyyid.adminshop", name = "AdminShop", description = "This plugin adds sign shops for users to buy items.", version = "1.8")
 public class AdminShop
 {
 	protected AdminShop()
@@ -118,8 +118,8 @@ public void init(GameInitializationEvent event)
 
 		Sponge.getCommandManager().register(this, setItemShopCommandSpec, "setshop");
 
-		Sponge.getEventManager().registerListeners(this, new PlayerBreakBlockListener());
-		Sponge.getEventManager().registerListeners(this, new PlayerInteractBlockListener());
+		Sponge.getEventManager().registerListeners(this, new BreakBlockListener());
+		Sponge.getEventManager().registerListeners(this, new InteractBlockListener());
 
 		getLogger().info("-----------------------------");
 		getLogger().info("AdminShop was made by HassanS6000!");

src/main/java/io/github/hsyyid/adminshop/listeners/BreakBlockListener.java

@@ -0,0 +1,62 @@
+package io.github.hsyyid.adminshop.listeners;
+
+import io.github.hsyyid.adminshop.AdminShop;
+import io.github.hsyyid.adminshop.utils.ConfigManager;
+import io.github.hsyyid.adminshop.utils.Shop;
+import org.spongepowered.api.block.BlockSnapshot;
+import org.spongepowered.api.data.Transaction;
+import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.block.ChangeBlockEvent;
+import org.spongepowered.api.text.Text;
+import org.spongepowered.api.text.format.TextColors;
+import org.spongepowered.api.world.Location;
+import org.spongepowered.api.world.World;
+
+import java.util.Optional;
+
+public class BreakBlockListener
+{
+	@Listener
+	public void onBreakBlock(ChangeBlockEvent.Break event)
+	{
+		if (event.getCause().first(Player.class).isPresent())
+		{
+			Player player = event.getCause().first(Player.class).get();
+
+			for (Transaction<BlockSnapshot> transaction : event.getTransactions())
+			{
+				Location<World> location = transaction.getOriginal().getLocation().get();
+				Optional<Shop> shop = AdminShop.shops.values().stream().filter(s -> s.getSignLocation().equals(location)).findAny();
+
+				if (shop.isPresent())
+				{
+					if (player.hasPermission("adminshop.remove"))
+					{
+						AdminShop.shops.values().remove(shop.get());
+						ConfigManager.writeShops();
+						player.sendMessage(Text.of(TextColors.DARK_RED, "[AdminShop]: ", TextColors.GREEN, "Shop successfully removed!"));
+					}
+					else
+					{
+						player.sendMessage(Text.of(TextColors.DARK_RED, "[AdminShop]: ", TextColors.RED, "You do not have permission to remove shops."));
+						event.setCancelled(true);
+					}
+				}
+			}
+		}
+		else
+		{
+			for (Transaction<BlockSnapshot> transaction : event.getTransactions())
+			{
+				Location<World> location = transaction.getOriginal().getLocation().get();
+				Optional<Shop> shop = AdminShop.shops.values().stream().filter(s -> s.getSignLocation().equals(location)).findAny();
+
+				if (shop.isPresent())
+				{
+					event.setCancelled(true);
+				}
+			}
+		}
+	}
+}

src/main/java/io/github/hsyyid/adminshop/listeners/PlayerInteractBlockListener.java → src/main/java/io/github/hsyyid/adminshop/listeners/InteractBlockListener.java

@@ -30,7 +30,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-public class PlayerInteractBlockListener
+public class InteractBlockListener
 {
 	@Listener
 	public void onPlayerRightClickBlock(InteractBlockEvent.Secondary event, @First Player player)