From 15031fa7d734fc82f96ff5594653848db58d398a Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 28 Jul 2021 09:39:14 +0200 Subject: [PATCH] Updated Upstream (CraftBukkit) (#6279) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 6788550f SPIGOT-6678: ChunkSnapshot#isSectionEmpty() not working as intended. 3ad0fb1c #901: Fix PlayerStatisticIncrementEvent spam --- patches/server/Add-permission-for-command-blocks.patch | 6 +++--- work/CraftBukkit | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/Add-permission-for-command-blocks.patch b/patches/server/Add-permission-for-command-blocks.patch index be6324bc19..9e4eb1a6bf 100644 --- a/patches/server/Add-permission-for-command-blocks.patch +++ b/patches/server/Add-permission-for-command-blocks.patch @@ -26,7 +26,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!this.server.isCommandBlockEnabled()) { this.player.sendMessage(new TranslatableComponent("advMode.notEnabled"), Util.NIL_UUID); - } else if (!this.player.canUseGameMasterBlocks()) { -+ } else if (!this.player.canUseGameMasterBlocks() && !this.player.isCreative() && !this.player.getBukkitEntity().hasPermission("minecraft.commandblock")) { // Paper - command block permission ++ } else if (!this.player.canUseGameMasterBlocks() && (!this.player.isCreative() || !this.player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission this.player.sendMessage(new TranslatableComponent("advMode.notAllowed"), Util.NIL_UUID); } else { BaseCommandBlock commandblocklistenerabstract = null; @@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!this.server.isCommandBlockEnabled()) { this.player.sendMessage(new TranslatableComponent("advMode.notEnabled"), Util.NIL_UUID); - } else if (!this.player.canUseGameMasterBlocks()) { -+ } else if (!this.player.canUseGameMasterBlocks() && !this.player.isCreative() && !this.player.getBukkitEntity().hasPermission("minecraft.commandblock")) { // Paper - command block permission ++ } else if (!this.player.canUseGameMasterBlocks() && (!this.player.isCreative() || !this.player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission this.player.sendMessage(new TranslatableComponent("advMode.notAllowed"), Util.NIL_UUID); } else { BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level); @@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public InteractionResult usedBy(Player player) { - if (!player.canUseGameMasterBlocks()) { -+ if (!player.canUseGameMasterBlocks() && !player.isCreative() && !player.getBukkitEntity().hasPermission("minecraft.commandblock")) { // Paper - command block permission ++ if (!player.canUseGameMasterBlocks() && (!player.isCreative() || !player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission return InteractionResult.PASS; } else { if (player.getCommandSenderWorld().isClientSide) { diff --git a/work/CraftBukkit b/work/CraftBukkit index aa69d1cfb9..6788550f7e 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit aa69d1cfb99f4784ed19b8918a7f5c1780b55fdb +Subproject commit 6788550f7e7c8dbe779f8acf442af36313de9996