fix: don't allow trampling when the event is cancelled

Wertik · Dec 31, 2024 · af56e9e · af56e9e
1 parent 0f1ce49
commit af56e9e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/blockregen-ancient/pom.xml b/blockregen-ancient/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BlockRegen</artifactId>
         <groupId>nl.aurorion.blockregen</groupId>
-        <version>3.17.2</version>
+        <version>3.17.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>nl.aurorion.blockregen</groupId>
             <artifactId>blockregen-version</artifactId>
-            <version>3.17.2</version>
+            <version>3.17.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/blockregen-common/pom.xml b/blockregen-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BlockRegen</artifactId>
         <groupId>nl.aurorion.blockregen</groupId>
-        <version>3.17.2</version>
+        <version>3.17.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/blockregen-legacy/pom.xml b/blockregen-legacy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BlockRegen</artifactId>
         <groupId>nl.aurorion.blockregen</groupId>
-        <version>3.17.2</version>
+        <version>3.17.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>nl.aurorion.blockregen</groupId>
             <artifactId>blockregen-version</artifactId>
-            <version>3.17.2</version>
+            <version>3.17.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/blockregen-plugin/pom.xml b/blockregen-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BlockRegen</artifactId>
         <groupId>nl.aurorion.blockregen</groupId>
-        <version>3.17.2</version>
+        <version>3.17.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -112,25 +112,25 @@
         <dependency>
             <groupId>nl.aurorion.blockregen</groupId>
             <artifactId>blockregen-common</artifactId>
-            <version>3.17.2</version>
+            <version>3.17.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>nl.aurorion.blockregen</groupId>
             <artifactId>blockregen-version</artifactId>
-            <version>3.17.2</version>
+            <version>3.17.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>nl.aurorion.blockregen</groupId>
             <artifactId>blockregen-legacy</artifactId>
-            <version>3.17.2</version>
+            <version>3.17.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>nl.aurorion.blockregen</groupId>
             <artifactId>blockregen-ancient</artifactId>
-            <version>3.17.2</version>
+            <version>3.17.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- Spigot API -->

diff --git a/blockregen-plugin/src/main/java/nl/aurorion/blockregen/listeners/RegenerationListener.java b/blockregen-plugin/src/main/java/nl/aurorion/blockregen/listeners/RegenerationListener.java
@@ -29,10 +29,7 @@
 import org.bukkit.entity.ExperienceOrb;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
+import org.bukkit.event.*;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPhysicsEvent;
@@ -88,9 +85,9 @@ public void onPhysics(BlockPhysicsEvent event) {
     }
 
     // Block trampling
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onInteract(PlayerInteractEvent event) {
-        if (event.getAction() != Action.PHYSICAL) {
+        if (event.getAction() != Action.PHYSICAL || event.useInteractedBlock() == Event.Result.DENY) {
             return;
         }
 

diff --git a/blockregen-version/pom.xml b/blockregen-version/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>BlockRegen</artifactId>
         <groupId>nl.aurorion.blockregen</groupId>
-        <version>3.17.2</version>
+        <version>3.17.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>blockregen-version</artifactId>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>nl.aurorion.blockregen</groupId>
             <artifactId>blockregen-common</artifactId>
-            <version>3.17.2</version>
+            <version>3.17.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- Spigot API -->

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>nl.aurorion.blockregen</groupId>
     <artifactId>BlockRegen</artifactId>
-    <version>3.17.2</version>
+    <version>3.17.3-SNAPSHOT</version>
     <modules>
         <module>blockregen-version</module>
         <module>blockregen-common</module>