From c65c75dfd54d843935d7adee4b75af22834c6405 Mon Sep 17 00:00:00 2001
From: SirSmurfy2 <absolutionism1@gmail.com>
Date: Fri, 18 Jul 2025 11:59:37 -0400
Subject: [PATCH 1/3] Initial Commit

---
 build.gradle                                    |  4 ++--
 gradle.properties                               |  2 +-
 .../environments/java21/paper-1.21.8.json       | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 src/test/skript/environments/java21/paper-1.21.8.json

diff --git a/build.gradle b/build.gradle
index 465c05465c8..73d3fbdedce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ dependencies {
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
 	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.0'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.7-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.8-R0.1-SNAPSHOT'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
 
 	// bundled with Minecraft 1.19.4+ for display entity transforms
@@ -246,7 +246,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi
 def java21 = 21
 def java17 = 17
 
-def latestEnv = 'java21/paper-1.21.7.json'
+def latestEnv = 'java21/paper-1.21.8.json'
 def latestJava = java21
 def oldestJava = java17
 
diff --git a/gradle.properties b/gradle.properties
index dcba4acbd6a..669a8aae315 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,5 +7,5 @@ groupid=ch.njol
 name=skript
 version=2.12.0
 jarName=Skript.jar
-testEnv=java21/paper-1.21.7
+testEnv=java21/paper-1.21.8
 testEnvJavaVersion=21
diff --git a/src/test/skript/environments/java21/paper-1.21.8.json b/src/test/skript/environments/java21/paper-1.21.8.json
new file mode 100644
index 00000000000..935cdc8fba7
--- /dev/null
+++ b/src/test/skript/environments/java21/paper-1.21.8.json
@@ -0,0 +1,17 @@
+{
+	"name": "paper-1.21.8",
+	"resources": [
+		{"source": "server.properties.generic", "target": "server.properties"}
+	],
+	"paperDownloads": [
+		{
+			"version": "1.21.8",
+			"target": "paperclip.jar"
+		}
+	],
+	"skriptTarget": "plugins/Skript.jar",
+	"commandLine": [
+		"-Dcom.mojang.eula.agree=true",
+		"-jar", "paperclip.jar", "--nogui"
+	]
+}

From e52a2232b30b924d52eb761fb860e67024f016cf Mon Sep 17 00:00:00 2001
From: SirSmurfy2 <absolutionism1@gmail.com>
Date: Fri, 18 Jul 2025 13:31:11 -0400
Subject: [PATCH 2/3] Delete paper-1.21.7.json

---
 .../environments/java21/paper-1.21.7.json       | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 src/test/skript/environments/java21/paper-1.21.7.json

diff --git a/src/test/skript/environments/java21/paper-1.21.7.json b/src/test/skript/environments/java21/paper-1.21.7.json
deleted file mode 100644
index 30ad4211522..00000000000
--- a/src/test/skript/environments/java21/paper-1.21.7.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "paper-1.21.7",
-	"resources": [
-		{"source": "server.properties.generic", "target": "server.properties"}
-	],
-	"paperDownloads": [
-		{
-			"version": "1.21.7",
-			"target": "paperclip.jar"
-		}
-	],
-	"skriptTarget": "plugins/Skript.jar",
-	"commandLine": [
-		"-Dcom.mojang.eula.agree=true",
-		"-jar", "paperclip.jar", "--nogui"
-	]
-}

From 7e29374f641e7673ebe2439d6e2d03904c45be48 Mon Sep 17 00:00:00 2001
From: SirSmurfy2 <absolutionism1@gmail.com>
Date: Thu, 24 Jul 2025 15:23:42 -0400
Subject: [PATCH 3/3] Update Block Implementations

---
 .../java/ch/njol/skript/util/BlockStateBlock.java | 15 +++++++++++++++
 .../ch/njol/skript/util/DelayedChangeBlock.java   | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/main/java/ch/njol/skript/util/BlockStateBlock.java b/src/main/java/ch/njol/skript/util/BlockStateBlock.java
index d51eccacef4..23973db4781 100644
--- a/src/main/java/ch/njol/skript/util/BlockStateBlock.java
+++ b/src/main/java/ch/njol/skript/util/BlockStateBlock.java
@@ -338,6 +338,21 @@ public void run() {
 		}
 	}
 
+	@Override
+	public boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect, boolean dropExperience, boolean forceEffect) {
+		if (delayChanges) {
+			Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), new Runnable() {
+				@Override
+				public void run() {
+					state.getBlock().breakNaturally(tool, triggerEffect, dropExperience, forceEffect);
+				}
+			});
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	@Override
 	public void tick() {
 		state.getBlock().tick();
diff --git a/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java b/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java
index 687639d94a0..f4916284a85 100644
--- a/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java
+++ b/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java
@@ -339,6 +339,21 @@ public void run() {
 		}
 	}
 
+	@Override
+	public boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect, boolean dropExperience, boolean forceEffect) {
+		if (newState != null) {
+			return false;
+		} else {
+			Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), new Runnable() {
+				@Override
+				public void run() {
+					block.breakNaturally(tool, triggerEffect, dropExperience, forceEffect);
+				}
+			});
+			return true;
+		}
+	}
+
 	@Override
 	public void tick() {
 		block.tick();