fixes

Author: hyperdefined

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>

src/main/java/lol/hyper/toolstats/ToolStats.java

@@ -74,7 +74,7 @@ public final class ToolStats extends JavaPlugin {
     public final Logger logger = this.getLogger();
     public final File configFile = new File(this.getDataFolder(), "config.yml");
     public FileConfiguration config;
-    public final int CONFIG_VERSION = 2;
+    public final int CONFIG_VERSION = 3;
 
     @Override
     public void onEnable() {

src/main/java/lol/hyper/toolstats/events/BlocksMined.java

@@ -44,6 +44,9 @@ public BlocksMined(ToolStats toolStats) {
 
     @EventHandler
     public void onBreak(BlockBreakEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
         Player player = event.getPlayer();
         if (player.getGameMode() != GameMode.SURVIVAL) {
             return;

src/main/java/lol/hyper/toolstats/events/CraftItem.java

@@ -19,6 +19,7 @@
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.UUIDDataType;
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -46,6 +47,9 @@ public CraftItem(ToolStats toolStats) {
 
     @EventHandler
     public void onCraft(CraftItemEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
         Player player = (Player) event.getWhoClicked();
         ItemStack itemStack = event.getCurrentItem();
         if (itemStack == null || itemStack.getType() == Material.AIR) {
@@ -54,6 +58,12 @@ public void onCraft(CraftItemEvent event) {
         String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
         for (String x : validItems) {
             if (name.contains(x)) {
+                if (event.isShiftClick()) {
+                    String configMessage = toolStats.config.getString("messages.shift-click-warning.crafting");
+                    if (configMessage != null) {
+                        event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
+                    }
+                }
                 if (addLore(itemStack, player) == null) {
                     return;
                 }
@@ -71,6 +81,11 @@ private ItemStack addLore(ItemStack itemStack, Player owner) {
         long timeCreated = System.currentTimeMillis();
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+            return null;
+        }
+
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
         container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
 

src/main/java/lol/hyper/toolstats/events/EntityDamage.java

@@ -49,6 +49,9 @@ public EntityDamage(ToolStats toolStats) {
 
     @EventHandler
     public void onDamage(EntityDamageByEntityEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
         if (!(event.getEntity() instanceof LivingEntity)) {
             return;
         }

src/main/java/lol/hyper/toolstats/events/GenerateLoot.java

@@ -84,6 +84,11 @@ private ItemStack addLore(ItemStack itemStack, Player owner) {
         long timeCreated = System.currentTimeMillis();
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+            return null;
+        }
+
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
         container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
 

src/main/java/lol/hyper/toolstats/events/PickupItem.java

@@ -47,6 +47,9 @@ public PickupItem(ToolStats toolStats) {
 
     @EventHandler
     public void onPickup(EntityPickupItemEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
         Entity entity = event.getEntity();
         if (entity instanceof Player) {
             ItemStack itemStack = event.getItem().getItemStack();

src/main/java/lol/hyper/toolstats/events/PlayerFish.java

@@ -50,6 +50,9 @@ public PlayerFish(ToolStats toolStats) {
 
     @EventHandler
     public void onFish(PlayerFishEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
         // only listen to when a player catches a fish
         if (event.getState() != PlayerFishEvent.State.CAUGHT_FISH) {
             return;
@@ -134,6 +137,11 @@ private void addNewLore(ItemStack itemStack, Player owner) {
         long timeCreated = System.currentTimeMillis();
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+            return;
+        }
+
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
         container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
 

src/main/java/lol/hyper/toolstats/events/SheepShear.java

@@ -43,6 +43,9 @@ public SheepShear(ToolStats toolStats) {
 
     @EventHandler
     public void onShear(PlayerInteractEntityEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
         Player player = event.getPlayer();
         Entity entity = event.getRightClicked();
         if (!(entity instanceof Sheep)) {

src/main/java/lol/hyper/toolstats/events/VillagerTrade.java

@@ -20,6 +20,7 @@
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.UUIDDataType;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -61,6 +62,12 @@ public void onTrade(InventoryClickEvent event) {
                 ItemStack item = event.getCurrentItem();
                 for (String x : validItems) {
                     if (item.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
+                        if (event.isShiftClick()) {
+                            String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
+                            if (configMessage != null) {
+                                event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
+                            }
+                        }
                         ItemStack newItem = addLore(item, (Player) event.getWhoClicked());
                         if (newItem == null) {
                             return;
@@ -80,6 +87,11 @@ private ItemStack addLore(ItemStack itemStack, Player owner) {
         long timeCreated = System.currentTimeMillis();
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+            return null;
+        }
+
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
         container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());