Cooldown bug fix and improvement.

biscuut · Sep 14, 2018 · 029716c · 029716c
1 parent 5de8a15
commit 029716c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>xyz.biscut.chunkbuster</groupId>
     <artifactId>ChunkBuster</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
     <name>ChunkBuster</name>
 
     <build>
@@ -34,6 +34,12 @@
                 </configuration>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
     <repositories>

diff --git a/src/main/java/xyz/biscut/chunkbuster/events/PlayerEvents.java b/src/main/java/xyz/biscut/chunkbuster/events/PlayerEvents.java
@@ -54,7 +54,6 @@ public void onChunkBusterPlace(BlockPlaceEvent e) {
                                             return;
                                         }
                                     }
-                                    playerCooldowns.put(p, System.currentTimeMillis() + (1000 * main.getConfigValues().getCooldown()));
                                 }
                                 chunkBusterLocations.put(p, e.getBlock().getLocation());
                                 if (!p.getOpenInventory().getTitle().contains(main.getConfigValues().getGUITitle())) {
@@ -152,6 +151,7 @@ public void onConfirmClick(InventoryClickEvent e) {
                                     }
                                 } else {
                                     if (e.getCurrentItem() != null && e.getCurrentItem().hasItemMeta() && e.getCurrentItem().getItemMeta().getDisplayName().contains(main.getConfigValues().getConfirmName())) {
+                                        playerCooldowns.put(p, System.currentTimeMillis() + (1000 * main.getConfigValues().getCooldown()));
                                         if (main.getConfigValues().confirmSoundEnabled()) {
                                             p.playSound(p.getLocation(), main.getConfigValues().getConfirmSoundString(), main.getConfigValues().getConfirmSoundVolume(), main.getConfigValues().getConfirmSoundPitch());
                                         }

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -6,7 +6,7 @@
 # | \__/\| | | || |_| || | | ||   < | |_/ /| |_| |\__ \| |_|  __/| |    #
 #  \____/|_| |_| \__,_||_| |_||_|\_\\____/  \__,_||___/ \__|\___||_|    #
 #                                                                       #
-#                           v1.1.5 by Biscut                            #
+#                           v${version} by Biscut                            #
 #########################################################################
 
 chunkbuster:

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: xyz.biscut.chunkbuster.ChunkBuster
-version: 1.1.5
+version: ${version}
 name: ChunkBuster
 author: Biscut
 softdepend: [MassiveCore, Factions, WorldGuard]