Spigot / Spigot / 4165cd8f453

Commits

md_5 authored 4165cd8f453 25 Feb 2019

SPIGOT-4636: Add creative mode NBT permissions

CraftBukkit-Patches/0118-Add-creative-mode-NBT-permissions.patch

Added

-+
+From d5793cdcf604bb4dd5cefad489b50551d34fbd6f Mon Sep 17 00:00:00 2001
-+
+From: md_5 <git@md-5.net>
-+
+Date: Mon, 25 Feb 2019 19:26:56 +1100
-+
+Subject: [PATCH] Add creative mode NBT permissions
-+
-+
-+
+diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-+
+index 85d364b8f..f27d565e1 100644
-+
+--- a/src/main/java/net/minecraft/server/ItemBlock.java
-+
++++ b/src/main/java/net/minecraft/server/ItemBlock.java
-+
+@@ -96,7 +96,7 @@ public class ItemBlock extends Item {
-+
+                 TileEntity tileentity = world.getTileEntity(blockposition);
-+
-+
+                 if (tileentity != null) {
-+
+-                    if (!world.isClientSide && tileentity.isFilteredNBT() && (entityhuman == null || !entityhuman.isCreativeAndOp())) {
-+
++                    if (!world.isClientSide && tileentity.isFilteredNBT() && (entityhuman == null || !(entityhuman.isCreativeAndOp() || (entityhuman.abilities.canInstantlyBuild && entityhuman.getBukkitEntity().hasPermission("minecraft.nbt.place"))))) { // Spigot - add permission
-+
+                         return false;
-+
+                     }
-+
-+
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-+
+index 55b4d57af..9c1aedb28 100644
-+
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-+
+@@ -2246,7 +2246,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-+
+             ItemStack itemstack = packetplayinsetcreativeslot.getItemStack();
-+
+             NBTTagCompound nbttagcompound = itemstack.b("BlockEntityTag");
-+
-+
+-            if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.hasKey("x") && nbttagcompound.hasKey("y") && nbttagcompound.hasKey("z")) {
-+
++            if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.hasKey("x") && nbttagcompound.hasKey("y") && nbttagcompound.hasKey("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot
-+
+                 BlockPosition blockposition = new BlockPosition(nbttagcompound.getInt("x"), nbttagcompound.getInt("y"), nbttagcompound.getInt("z"));
-+
+                 TileEntity tileentity = this.player.world.getTileEntity(blockposition);
-+
-+
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-+
+index c54d3efd6..04d9a7fe0 100644
-+
+--- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-+
++++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-+
+@@ -12,6 +12,10 @@ public final class CraftDefaultPermissions {
-+
+     public static void registerCorePermissions() {
-+
+         Permission parent = DefaultPermissions.registerPermission(ROOT, "Gives the user the ability to use all vanilla utilities and commands");
-+
+         CommandPermissions.registerPermissions(parent);
-+
++        // Spigot start
-+
++        DefaultPermissions.registerPermission(ROOT + ".nbt.place", "Gives the user the ability to place restricted blocks with NBT in creative", PermissionDefault.OP, parent);
-+
++        DefaultPermissions.registerPermission(ROOT + ".nbt.copy", "Gives the user the ability to copy NBT in creative", PermissionDefault.TRUE, parent);
-+
++        // Spigot end
-+
+         parent.recalculatePermissibles();
-+
+     }
-+
+ }
-+
+--
-+
+.19.1
-+

Spigot

Commits

Jira Issues

Add shortcut