Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #46 - Essentials EC overriding Purpur

Browse Source
This commit is contained in:
William Blake Galbreath
2020-09-14 08:25:35 -05:00
parent a919aa3119
commit 8ec6f6f22f
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
patches/server/0006-Barrels-and-enderchests-6-rows.patch
View File

@@ -37,10 +37,10 @@ index 896d99d40..9ab8336df 100644
}, BlockEnderChest.e)); }, BlockEnderChest.e));
entityhuman.a(StatisticList.OPEN_ENDERCHEST); 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 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
index bf8c5436b..d147377e5 100644 index bf8c5436b..5e56d5933 100644
--- a/src/main/java/net/minecraft/server/InventoryEnderChest.java --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
+++ b/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 { @@ -20,11 +20,34 @@ public class InventoryEnderChest extends InventorySubcontainer {
} }
public InventoryEnderChest(EntityHuman owner) { public InventoryEnderChest(EntityHuman owner) {
@@ -49,8 +49,35 @@ index bf8c5436b..d147377e5 100644
this.owner = owner; this.owner = owner;
// CraftBukkit end // CraftBukkit end
} }
+ // Purpur start
+ @Override
+ public int getSize() {
+ if (net.pl3x.purpur.PurpurConfig.enderChestSixRows && net.pl3x.purpur.PurpurConfig.enderChestPermissionRows && owner != null && owner.getProfile() != null) {
+ org.bukkit.craftbukkit.entity.CraftHumanEntity bukkit = owner.getBukkitEntity();
+ if (bukkit.hasPermission("purpur.enderchest.rows.six")) {
+ return 54;
+ } else if (bukkit.hasPermission("purpur.enderchest.rows.five")) {
+ return 45;
+ } else if (bukkit.hasPermission("purpur.enderchest.rows.four")) {
+ return 36;
+ } else if (bukkit.hasPermission("purpur.enderchest.rows.three")) {
+ return 27;
+ } else if (bukkit.hasPermission("purpur.enderchest.rows.two")) {
+ return 18;
+ } else if (bukkit.hasPermission("purpur.enderchest.rows.one")) {
+ return 9;
+ }
+ }
+ return super.getSize();
+ }
+ // Purpur end
+
public void a(TileEntityEnderChest tileentityenderchest) {
this.a = tileentityenderchest;
}
diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
index c5551a9e9..03bde6067 100644 index a1c3942cb..953741c1c 100644
--- a/src/main/java/net/minecraft/server/TileEntityBarrel.java --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
+++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
@@ -55,7 +55,7 @@ public class TileEntityBarrel extends TileEntityLootable { @@ -55,7 +55,7 @@ public class TileEntityBarrel extends TileEntityLootable {
@@ -137,7 +164,7 @@ index 8c714c743..cae362bae 100644
case DISPENSER: case DISPENSER:
case DROPPER: case DROPPER:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index 726631348..a45100034 100644 index bba9bddc1..c2802c5bf 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/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 { @@ -81,7 +81,7 @@ public class CraftInventory implements Inventory {