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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
d33ba160 Fix incorrect keyword use on visibleChunksClone
2f343015 Updated Upstream (Bukkit/CraftBukkit)
a65831bd Optimize PlayerChunkMap memory use for visibleChunks
This commit is contained in:
William Blake Galbreath
2020-04-08 23:13:03 -05:00
parent 891673a2a0
commit a29baddb7d
23 changed files with 65 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0068-Enderchest-6-rows-plus-permissions.patch
View File

@@ -1,4 +1,4 @@
From 19559ab2a0001868fe0f30486e873b974c37ca48 Mon Sep 17 00:00:00 2001
From 730a0b2c96d54f9bba6c241e2aabdb9e7e5aa2f6 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)
@@ -7,10 +7,10 @@ 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 | 3 ++-
.../craftbukkit/inventory/CraftContainer.java | 2 +-
.../craftbukkit/inventory/CraftInventory.java | 2 +-
.../permissions/CraftDefaultPermissions.java | 8 +++++++
6 files changed, 41 insertions(+), 3 deletions(-)
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 0a892a5f1a..e7ef571dc5 100644
@@ -85,18 +85,10 @@ index 392f4f8771..3f8648cd71 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index afb40a7523..7bf1e224a6 100644
index 9f05b76ff7..4dc632d917 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -156,6 +156,7 @@ public class CraftContainer extends Container {
case STONECUTTER:
return Containers.STONECUTTER;
case BARREL: return net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3; // Purpur
+ case ENDER_CHEST: return net.pl3x.purpur.PurpurConfig.enderChestSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3; // Purpur
default:
return Containers.GENERIC_9X3;
}
@@ -169,7 +170,7 @@ public class CraftContainer extends Container {
@@ -195,7 +195,7 @@ public class CraftContainer extends Container {
case PLAYER:
case CHEST:
case ENDER_CHEST: