diff options
| author | Jason <[email protected]> | 2021-12-01 23:21:14 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-01 23:21:14 -0800 |
| commit | 956124f86a93515cf67ee850e96cfd7bc58e27e8 (patch) | |
| tree | f4fb2a59546d4062cd0b6839e627be01636857d6 | |
| parent | a5a7782f40485e8ce0880ae824fbe6649d870410 (diff) | |
| download | Paper-956124f86a93515cf67ee850e96cfd7bc58e27e8.tar.gz Paper-956124f86a93515cf67ee850e96cfd7bc58e27e8.zip | |
Build updates (#6992)
| -rw-r--r-- | build.gradle.kts | 7 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | patches/server/0615-Add-Block-isValidTool.patch | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 07c10fed5b..796cd83277 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.0" apply false - id("io.papermc.paperweight.core") version "1.3.0" + id("io.papermc.paperweight.core") version "1.3.1" } allprojects { @@ -46,7 +46,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.18-rc3+build.2:mergedv2") + paramMappings("net.fabricmc:yarn:1.18+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.7.0:fat") decompiler("net.minecraftforge:forgeflower:1.5.498.22") paperclip("io.papermc:paperclip:3.0.2") @@ -72,10 +72,11 @@ paperweight { "com.destroystokyo.paper", "com.mojang", "io.papermc.paper", + "ca.spottedleaf", "net.kyori.adventure.bossbar", "net.minecraft", "org.bukkit.craftbukkit", - "org.spigotmc" + "org.spigotmc", ) } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e09..84d1f85fd6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/patches/server/0615-Add-Block-isValidTool.patch b/patches/server/0615-Add-Block-isValidTool.patch index 26174997c9..80337e27f0 100644 --- a/patches/server/0615-Add-Block-isValidTool.patch +++ b/patches/server/0615-Add-Block-isValidTool.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Block#isValidTool diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 4c30b6d0d70a48b39bd99b5e9761f950b8b0c340..011f34034bf6d8481e91b08894c68d87de41f2c1 100644 +index a992c5d0cbc3882d7fb1343aa4ca784cad6cc1a9..1cc8edc51bedc53ee82490bc1df4a36a5a88c028 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -@@ -672,5 +672,9 @@ public class CraftBlock implements Block { +@@ -675,5 +675,9 @@ public class CraftBlock implements Block { } return speed; } |