Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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/0067-Barrels-have-6-rows.patch
View File

@@ -1,4 +1,4 @@
From 51887c8d479ca17be120f8320c13a43792d272a3 Mon Sep 17 00:00:00 2001
From 3b81011884895ab7dba9c3f29a536a2ec0268dad Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Barrels have 6 rows
@@ -6,8 +6,8 @@ Subject: [PATCH] Barrels have 6 rows
---
src/main/java/net/minecraft/server/TileEntityBarrel.java | 5 +++--
src/main/java/net/pl3x/purpur/PurpurConfig.java | 9 +++++++++
.../org/bukkit/craftbukkit/inventory/CraftContainer.java | 5 ++++-
3 files changed, 16 insertions(+), 3 deletions(-)
.../org/bukkit/craftbukkit/inventory/CraftContainer.java | 4 +++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
index 1e27abbea0..ca3b6c9aae 100644
@@ -69,18 +69,10 @@ index 777f167293..392f4f8771 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index b4a7d982eb..afb40a7523 100644
index 4f43f87cd4..9f05b76ff7 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -155,6 +155,7 @@ public class CraftContainer extends Container {
return Containers.GRINDSTONE;
case STONECUTTER:
return Containers.STONECUTTER;
+ case BARREL: return net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3; // Purpur
default:
return Containers.GENERIC_9X3;
}
@@ -168,8 +169,10 @@ public class CraftContainer extends Container {
@@ -195,8 +195,10 @@ public class CraftContainer extends Container {
case PLAYER:
case CHEST:
case ENDER_CHEST: