From 2b1b125ffadf1ef53b946f7da55337f638452dcc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 8 Jul 2022 20:59:01 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5ffeb70 Use getChunkForLighting instead of getChunkAtImmediately in fixlight to properly ignore imposter chunks PaperMC/Paper@e294802 Refactor paper command (#8112) --- gradle.properties | 2 +- patches/api/0006-Default-permissions.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index d38623be8..c4a5f3a05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = 41238a4e246017cbbc9cdd066253b99e7279e086 +paperCommit = e29480297798ed8bb5deff95bdb20f1b2594713c org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0006-Default-permissions.patch b/patches/api/0006-Default-permissions.patch index fbf03f1f4..779b9c199 100644 --- a/patches/api/0006-Default-permissions.patch +++ b/patches/api/0006-Default-permissions.patch @@ -31,7 +31,7 @@ index e1a4ddf2c07cdd242fa8054a0152522fe4039e85..8e481e3815f5645ee92f0d229e5ff25c } diff --git a/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java new file mode 100644 -index 0000000000000000000000000000000000000000..316f3f7f865d5ccc7bdab9d3de5b0d558f96d11f +index 0000000000000000000000000000000000000000..bed91e726faae389536c8725061f23f069ba6b21 --- /dev/null +++ b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java @@ -0,0 +1,79 @@ @@ -75,8 +75,8 @@ index 0000000000000000000000000000000000000000..316f3f7f865d5ccc7bdab9d3de5b0d55 + DefaultPermissions.registerPermission(PREFIX + "debug.f3n", "Allows the user to use F3+N keybind to swap gamemodes", PermissionDefault.FALSE, purpur); + DefaultPermissions.registerPermission(PREFIX + "joinfullserver", "Allows the user to join a full server", PermissionDefault.OP, purpur); + -+ DefaultPermissions.registerPermission(PREFIX + "drop.spawner", "Allows the user to drop spawner cage when broken with diamond pickaxe with silk touch", PermissionDefault.FALSE, purpur); -+ DefaultPermissions.registerPermission(PREFIX + "place.spawner", "Allows the user to place spawner cage in the world", PermissionDefault.FALSE, purpur); ++ DefaultPermissions.registerPermission(PREFIX + "drop.spawners", "Allows the user to drop spawner cage when broken with diamond pickaxe with silk touch", PermissionDefault.FALSE, purpur); ++ DefaultPermissions.registerPermission(PREFIX + "place.spawners", "Allows the user to place spawner cage in the world", PermissionDefault.FALSE, purpur); + + DefaultPermissions.registerPermission(PREFIX + "anvil.color", "Allows the user to use color codes on anvils", PermissionDefault.FALSE, purpur); +