From 5bea8f41b60b561a36cdb735354900e2ece45d39 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Sun, 9 Feb 2025 17:32:55 +0100 Subject: [PATCH] Disallow the .fillFromCreative command outside of creative mode. fixes #1022 fixes #743 --- src/Inventory.zig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Inventory.zig b/src/Inventory.zig index c781ce21..d45c1a7b 100644 --- a/src/Inventory.zig +++ b/src/Inventory.zig @@ -1394,8 +1394,10 @@ pub const Command = struct { // MARK: Command item: ?Item, amount: u16 = 0, - fn run(self: FillFromCreative, allocator: NeverFailingAllocator, cmd: *Command, side: Side, _: ?*main.server.User, _: Gamemode) error{serverFailure}!void { + fn run(self: FillFromCreative, allocator: NeverFailingAllocator, cmd: *Command, side: Side, user: ?*main.server.User, mode: Gamemode) error{serverFailure}!void { if(self.dest.inv.type == .workbench and self.dest.slot == 25) return; + if(side == .server and user != null and mode != .creative) return; + if(side == .client and mode != .creative) return; if(!self.dest.ref().empty()) { cmd.executeBaseOperation(allocator, .{.delete = .{