Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-22 15:23:12 +01:00
Code Issues Projects Releases Wiki Activity

Respect permissions when constructing InventoryEnderChest

Browse Source
This commit is contained in:
Ivan Pekov 2020-09-10 09:13:00 +03:00
parent 347ab2bae2
commit b4d77a95d1
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PATCHES.md
View File

@ -101,6 +101,7 @@ # Patches
| server | Remove some streams and object allocations | Phoenix616 | |
| server | Remove stream for ender teleport | Sotr | |
| server | Remove vanilla profiler callers | Sotr | |
| server | Respect permissions when constructing InventoryEnderChest | Ivan Pekov | |
| server | Send more packets immediately | MrIvanPlays | |
| server | Skip events if there's no listeners | William Blake Galbreath | |
| server | Snowman drop and put back pumpkin | William Blake Galbreath | |

53
patches/server/0046-Respect-permissions-when-constructing-InventoryEnder.patch Normal file
View File

@ -0,0 +1,53 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ivan Pekov <ivan@mrivanplays.com>
Date: Thu, 10 Sep 2020 09:02:02 +0300
Subject: [PATCH] Respect permissions when constructing InventoryEnderChest
Fixes Purpur-46
diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
index d147377e5d2ee818f941f50f7392a1bc7f584ffb..6df8bb07b62979561d7c3773a542aba7c74857e4 100644
--- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
+++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
@@ -20,7 +20,27 @@ public class InventoryEnderChest extends InventorySubcontainer {
}
public InventoryEnderChest(EntityHuman owner) {
- super(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? 54 : 27); // Purpur
+ super(() -> { // Yatopia start
+ if (net.pl3x.purpur.PurpurConfig.enderChestSixRows) {
+ if (net.pl3x.purpur.PurpurConfig.enderChestPermissionRows) {
+ if (owner.getBukkitEntity().hasPermission("purpur.enderchest.rows.six")) {
+ return 54;
+ } else if (owner.getBukkitEntity().hasPermission("purpur.enderchest.rows.five")) {
+ return 45;
+ } else if (owner.getBukkitEntity().hasPermission("purpur.enderchest.rows.four")) {
+ return 36;
+ } else if (owner.getBukkitEntity().hasPermission("purpur.enderchest.rows.three")) {
+ return 27;
+ } else if (owner.getBukkitEntity().hasPermission("purpur.enderchest.rows.two")) {
+ return 18;
+ } else if (owner.getBukkitEntity().hasPermission("purpur.enderchest.rows.one")) {
+ return 9;
+ } else { /* prevent breakage */ return 27; }
+ } else {
+ return 54;
+ }
+ } else { return 27; }
+ }); // Purpur // Yatopia end
this.owner = owner;
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/InventorySubcontainer.java b/src/main/java/net/minecraft/server/InventorySubcontainer.java
index 4cf5dad0939ecb636752e19ad19aec2c882d5efc..5bb7699397c98473197c1134acf8444533cb8507 100644
--- a/src/main/java/net/minecraft/server/InventorySubcontainer.java
+++ b/src/main/java/net/minecraft/server/InventorySubcontainer.java
@@ -58,6 +58,8 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput {
return null;
}
+ public InventorySubcontainer(java.util.function.Supplier<Integer> size) { this(size.get()); } // Yatopia
+
public InventorySubcontainer(int i) {
this(i, null);
}