Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
a032d548bf9838d21e45d4d1863a3705fe8d2bcd
Purpur/patches/server/0065-Enderchest-6-rows-plus-permissions.patch
William Blake Galbreath 860c86191a Updated Upstream (Paper) 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c8028d1c Fix data version check for ItemStack serialization (#3394)
9254a80a Fix race condition reintroduced in Prioritize class loader patch
6f196fe7 Add Raw Byte ItemStack Serialization
df43f828 Allow server startup for those poor people running <1G Xmx
3c9b65ef Fix cases where no-tick < tick view distance
72f89a07 Workaround for Client Lag Spikes (MC-162253)
3f941c0c Add option for console having all permissions
d2ae4658 Add permission for command blocks
9f8ae5cb Prioritise own classes where possible
74466412 Check portal restrictions when entering end gateways
fc9cf84d Fix NPE when temp ip bans expire (#3373)
16bd420d Add missing mob goals for API (#3367)
b5c4e2f6 Ensure no-tick view is not smaller than ticking VD
52564b1f Expand Pathfinding API with more options
dde65481 Fix usage of vanilla goals
7797aebe Drop Leads from nether portals - Fixes #3226
511b6bc2 Reduce MutableInt and Vec3d allocations, use ArrayDeque
84673141 Optimize NibbleArray to use pooled buffers
897dd2c8 Foundational work for Future Memory usage improvements
bb4002d8 Handle CraftPlayer#setSpectatorTarget better
4ae08959 Fix collision checks on spawning hanging entities and null on async chunk loads
c2f8d1ef Protect Bedrock and End Portal/Frames from being destroyed
827cc632 Updated Upstream (Bukkit/CraftBukkit/Spigot)
92f680ed Fix Pathfinding and obscure glitchy buggy 0 tick farms
7a7c4292 Optimize Pathfinder - Remove Streams / Optimized collections
fc917d16 Optimize Hoppers - Major performance improvement
14ad77c6 Fix PotionEffect API Ignoring Icon bug
eb3ce8a2 Fix EntityRaider picking up items when they shouldn't be able
1ea9ada0 Add a TELEPORT ticket when changing dimensions
8e9459ea Fix missing flag pass for isUrgent
7befec44 Potential bed api (#3339)
27945a6b Optimize WorldBorder collision checks and air
55e17a85 Wait for Async Tasks during shutdown
b5905256 Ensure Entity AABB's are never invalid
a054aa6f Properly remove Entities from current chunk
c894ddfd Fix teleporting onto a chunk line
57d6cc01 Send LOGIN protocol packets immediately - Fix disconnect during async prelogin
cd93e54d Don't use our modified chunk checks for collision in world gen
b4003ef1 Allow loading entities current chunk if needed to fix collision checks
e5f64896 Add Urgent API for Async Chunks API and use it for Async Teleport
ad8e59dc Ensure chunks loaded on respawn for suffocation check
2020-05-18 15:22:23 -05:00

135 lines
9.0 KiB
Diff
Raw Blame History

From 483872160dc3cbc799420a8c1db32ef5e4bbe143 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 23 Jun 2019 17:01:26 -0500
Subject: [PATCH] Enderchest 6 rows (plus permissions)
---
.../net/minecraft/server/BlockEnderChest.java | 21 +++++++++++++++++++
.../minecraft/server/InventoryEnderChest.java | 2 +-
.../java/net/pl3x/purpur/PurpurConfig.java | 8 +++++++
.../craftbukkit/inventory/CraftContainer.java | 2 +-
.../craftbukkit/inventory/CraftInventory.java | 2 +-
.../permissions/CraftDefaultPermissions.java | 8 +++++++
6 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
index 0a892a5f1..e7ef571dc 100644
--- a/src/main/java/net/minecraft/server/BlockEnderChest.java
+++ b/src/main/java/net/minecraft/server/BlockEnderChest.java
@@ -48,6 +48,27 @@ public class BlockEnderChest extends BlockChestAbstract<TileEntityEnderChest> im
inventoryenderchest.a(tileentityenderchest);
entityhuman.openContainer(new TileInventory((i, playerinventory, entityhuman1) -> {
+ // Purpur start
+ if (net.pl3x.purpur.PurpurConfig.enderChestSixRows) {
+ if (net.pl3x.purpur.PurpurConfig.enderChestPermissionRows) {
+ org.bukkit.craftbukkit.entity.CraftHumanEntity player = entityhuman.getBukkitEntity();
+ if (player.hasPermission("purpur.enderchest.rows.six")) {
+ return new ContainerChest(Containers.GENERIC_9X6, i, playerinventory, inventoryenderchest, 6);
+ } else if (player.hasPermission("purpur.enderchest.rows.five")) {
+ return new ContainerChest(Containers.GENERIC_9X5, i, playerinventory, inventoryenderchest, 5);
+ } else if (player.hasPermission("purpur.enderchest.rows.four")) {
+ return new ContainerChest(Containers.GENERIC_9X4, i, playerinventory, inventoryenderchest, 4);
+ } else if (player.hasPermission("purpur.enderchest.rows.three")) {
+ return new ContainerChest(Containers.GENERIC_9X3, i, playerinventory, inventoryenderchest, 3);
+ } else if (player.hasPermission("purpur.enderchest.rows.two")) {
+ return new ContainerChest(Containers.GENERIC_9X2, i, playerinventory, inventoryenderchest, 2);
+ } else if (player.hasPermission("purpur.enderchest.rows.one")) {
+ return new ContainerChest(Containers.GENERIC_9X1, i, playerinventory, inventoryenderchest, 1);
+ }
+ }
+ return new ContainerChest(Containers.GENERIC_9X6, i, playerinventory, inventoryenderchest, 6);
+ }
+ // Purpur end
return ContainerChest.a(i, playerinventory, inventoryenderchest);
}, BlockEnderChest.e));
entityhuman.a(StatisticList.OPEN_ENDERCHEST);
diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
index fd31b9a6d..903c02e9e 100644
--- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
+++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
@@ -20,7 +20,7 @@ public class InventoryEnderChest extends InventorySubcontainer {
}
public InventoryEnderChest(EntityHuman owner) {
- super(27);
+ super(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? 54 : 27); // Purpur
this.owner = owner;
// CraftBukkit end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 581e8eebe..c3ecd6fc7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -157,14 +157,22 @@ public class PurpurConfig {
public static boolean barrelSixRows = false;
public static boolean slimeBlocksNotPushable = false;
+ public static boolean enderChestSixRows = false;
+ public static boolean enderChestPermissionRows = false;
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
set("settings.blocks.barrel.six-rows", oldValue);
set("settings.packed-barrels", null);
+ oldValue = getBoolean("settings.large-ender-chests", true);
+ set("settings.blocks.ender_chest.six-rows", oldValue);
+ set("settings.large-ender-chests", null);
}
barrelSixRows = getBoolean("settings.blocks.barrel.six-rows", barrelSixRows);
InventoryType.BARREL.setDefaultSize(barrelSixRows ? 54 : 27);
+ enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
+ InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
+ enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
slimeBlocksNotPushable = getBoolean("settings.blocks.slime.not-movable-by-piston", slimeBlocksNotPushable);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index d295821c5..610cbbe85 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -195,7 +195,7 @@ public class CraftContainer extends Container {
case PLAYER:
case CHEST:
case ENDER_CHEST:
- delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
+ delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.enderChestSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
break; // Purpur
case BARREL:
delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index 47827fbf1..0f5819a40 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -81,7 +81,7 @@ public class CraftInventory implements Inventory {
@Override
public void setContents(ItemStack[] items) {
- if (getSize() < items.length) {
+ if (false && getSize() < items.length) { // Purpur
throw new IllegalArgumentException("Invalid inventory size; expected " + getSize() + " or less");
}
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 a4a809f30..e7d19d67c 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
@@ -18,6 +18,14 @@ public final class CraftDefaultPermissions {
DefaultPermissions.registerPermission(ROOT + ".debugstick.always", "Gives the user the ability to use the debug stick in all game modes", org.bukkit.permissions.PermissionDefault.FALSE, parent);
DefaultPermissions.registerPermission(ROOT + ".commandblock", "Gives the user the ability to use command blocks.", org.bukkit.permissions.PermissionDefault.OP, parent); // Paper
// Spigot end
+ // Purpur start
+ DefaultPermissions.registerPermission("purpur.enderchest.rows.six", "Gives the user six rows of enderchest space", org.bukkit.permissions.PermissionDefault.FALSE);
+ DefaultPermissions.registerPermission("purpur.enderchest.rows.five", "Gives the user five rows of enderchest space", org.bukkit.permissions.PermissionDefault.FALSE);
+ DefaultPermissions.registerPermission("purpur.enderchest.rows.four", "Gives the user four rows of enderchest space", org.bukkit.permissions.PermissionDefault.FALSE);
+ DefaultPermissions.registerPermission("purpur.enderchest.rows.three", "Gives the user three rows of enderchest space", org.bukkit.permissions.PermissionDefault.FALSE);
+ DefaultPermissions.registerPermission("purpur.enderchest.rows.two", "Gives the user two rows of enderchest space", org.bukkit.permissions.PermissionDefault.FALSE);
+ DefaultPermissions.registerPermission("purpur.enderchest.rows.one", "Gives the user one row of enderchest space", org.bukkit.permissions.PermissionDefault.FALSE);
+ // Purpur end
parent.recalculatePermissibles();
}
}
--
2.24.0
Reference in New Issue View Git Blame Copy Permalink