Skip to content

Commit 8bc7ff4

Browse files
authored
Merge pull request #1971 from EngineHub/version/1.19.3
Update to Minecraft 1.19.3
2 parents cb100bb + 6f749b0 commit 8bc7ff4

File tree

10 files changed

+186
-305
lines changed

10 files changed

+186
-305
lines changed
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
object Versions {
2-
// const val PISTON = "0.4.3"
3-
// const val AUTO_VALUE = "1.6.5"
4-
const val WORLDEDIT = "7.2.10"
5-
const val JUNIT = "5.7.0"
6-
const val SQUIRRELID = "0.3.0"
7-
const val GUAVA = "31.0.1-jre"
8-
const val MOCKITO = "3.7.7"
2+
// const val PISTON = "0.4.3"
3+
// const val AUTO_VALUE = "1.6.5"
4+
const val WORLDEDIT = "7.2.12"
5+
const val JUNIT = "5.9.1"
6+
const val MOCKITO = "4.9.0"
7+
const val SQUIRRELID = "0.3.1"
8+
const val GUAVA = "31.1-jre"
9+
const val FINDBUGS = "3.0.2"
910
}

gradle/wrapper/gradle-wrapper.jar

1.99 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

worldguard-bukkit/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ configurations {
2828

2929
dependencies {
3030
"api"(project(":worldguard-core"))
31-
"compileOnly"("io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT")
32-
"runtimeOnly"("org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT") {
31+
"compileOnly"("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
32+
"runtimeOnly"("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") {
3333
exclude("junit", "junit")
3434
}
3535
"api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }
3636
"implementation"("com.google.guava:guava:${Versions.GUAVA}")
3737
"compileOnly"("com.sk89q:commandbook:2.3") { isTransitive = false }
3838
"shadeOnly"("io.papermc:paperlib:1.0.7")
39-
"shadeOnly"("org.bstats:bstats-bukkit:2.1.0")
39+
"shadeOnly"("org.bstats:bstats-bukkit:3.0.0")
4040
"shadeOnly"("co.aikar:minecraft-timings:1.0.4")
4141
}
4242

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,9 +1197,12 @@ private static <T extends Event & Cancellable> void handleBlockRightClick(T even
11971197
}
11981198

11991199
// Handle created spawn eggs
1200-
if (item != null && Materials.isSpawnEgg(item.getType())) {
1201-
Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), Materials.getEntitySpawnEgg(item.getType())));
1202-
return;
1200+
if (item != null) {
1201+
EntityType possibleEntityType = Materials.getEntitySpawnEgg(item.getType());
1202+
if (possibleEntityType != null) {
1203+
Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), possibleEntityType));
1204+
return;
1205+
}
12031206
}
12041207

12051208
// handle water/lava placement

0 commit comments

Comments
 (0)