Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix large enderchest and barrels api issue

Browse Source
This commit is contained in:
William Blake Galbreath
2019-08-03 15:18:43 -05:00
parent 0f12db669a
commit 55cfdb6732
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0017-Packed-Barrels.patch
View File

@@ -1,4 +1,4 @@
From ff614fea4888bf73a22b8e6f1188236023a17cb1 Mon Sep 17 00:00:00 2001 From e04a47b6febfb7da9891ede1c777e0fe15d650a6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 21:50:37 -0500 Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Packed Barrels Subject: [PATCH] Packed Barrels
@@ -6,8 +6,8 @@ Subject: [PATCH] Packed Barrels
--- ---
src/main/java/net/minecraft/server/TileEntityBarrel.java | 5 +++-- src/main/java/net/minecraft/server/TileEntityBarrel.java | 5 +++--
src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++ src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++
.../org/bukkit/craftbukkit/inventory/CraftContainer.java | 4 ++++ .../org/bukkit/craftbukkit/inventory/CraftContainer.java | 6 +++++-
3 files changed, 14 insertions(+), 2 deletions(-) 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 diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
index 5d80ec801..dd8c6e887 100644 index 5d80ec801..dd8c6e887 100644
@@ -65,7 +65,7 @@ index 7063c6329..0ad1569e7 100644
public static boolean ridableBlaze = true; public static boolean ridableBlaze = true;
public static boolean ridableCat = true; public static boolean ridableCat = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index ae119756b..5ee6fc162 100644 index ae119756b..631d39967 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -155,6 +155,8 @@ public class CraftContainer extends Container { @@ -155,6 +155,8 @@ public class CraftContainer extends Container {
@@ -77,16 +77,18 @@ index ae119756b..5ee6fc162 100644
default: default:
return Containers.GENERIC_9X3; return Containers.GENERIC_9X3;
} }
@@ -168,7 +170,9 @@ public class CraftContainer extends Container { @@ -168,8 +170,10 @@ public class CraftContainer extends Container {
case PLAYER: case PLAYER:
case CHEST: case CHEST:
case ENDER_CHEST: case ENDER_CHEST:
+ delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); break; // Purpur + delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
+ break;
case BARREL: case BARREL:
+ if (net.pl3x.purpur.PurpurConfig.packedBarrels) delegate = new ContainerChest(Containers.GENERIC_9X6, windowId, bottom, top, top.getSize() / 9); // Purpur - delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); + delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.packedBarrels ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
break; break;
case DISPENSER: case DISPENSER:
case DROPPER:
-- --
2.20.1 2.20.1

28
patches/server/0018-Add-large-sized-ender-chests.patch
View File

@@ -1,14 +1,14 @@
From 2e9bf1d3395dc41c6d441d13c304c0996af6e3ba Mon Sep 17 00:00:00 2001 From 72e755e41aec1b220824dc3eb2190752537881d9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 23 Jun 2019 17:01:26 -0500 Date: Sun, 23 Jun 2019 17:01:26 -0500
Subject: [PATCH] Add large sized ender chests Subject: [PATCH] Add large sized ender chests
--- ---
src/main/java/net/minecraft/server/BlockEnderChest.java | 1 + src/main/java/net/minecraft/server/BlockEnderChest.java | 1 +
.../java/net/minecraft/server/InventoryEnderChest.java | 2 +- src/main/java/net/minecraft/server/InventoryEnderChest.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 6 ++++++ src/main/java/net/pl3x/purpur/PurpurConfig.java | 6 ++++++
.../org/bukkit/craftbukkit/inventory/CraftContainer.java | 8 +++++++- .../org/bukkit/craftbukkit/inventory/CraftContainer.java | 4 +++-
4 files changed, 15 insertions(+), 2 deletions(-) 4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
index 4b7290238..fc5227683 100644 index 4b7290238..fc5227683 100644
@@ -53,7 +53,7 @@ index 0ad1569e7..abc43c4e3 100644
private static void packedBarrels() { private static void packedBarrels() {
packedBarrels = getBoolean("settings.packed-barrels", packedBarrels); packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index 5ee6fc162..fef1a774b 100644 index 631d39967..47c7013f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -157,6 +157,8 @@ public class CraftContainer extends Container { @@ -157,6 +157,8 @@ public class CraftContainer extends Container {
@@ -65,19 +65,15 @@ index 5ee6fc162..fef1a774b 100644
default: default:
return Containers.GENERIC_9X3; return Containers.GENERIC_9X3;
} }
@@ -170,7 +172,11 @@ public class CraftContainer extends Container { @@ -170,7 +172,7 @@ public class CraftContainer extends Container {
case PLAYER: case PLAYER:
case CHEST: case CHEST:
case ENDER_CHEST: case ENDER_CHEST:
- delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); break; // Purpur - delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
+ // Purpur start + delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.largeEnderChests ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
+ if (net.pl3x.purpur.PurpurConfig.largeEnderChests) delegate = new ContainerChest(Containers.GENERIC_9X6, windowId, bottom, top, top.getSize() / 9); break;
+ delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
+ break;
+ // Purpur end
case BARREL: case BARREL:
if (net.pl3x.purpur.PurpurConfig.packedBarrels) delegate = new ContainerChest(Containers.GENERIC_9X6, windowId, bottom, top, top.getSize() / 9); // Purpur delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.packedBarrels ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
-- --
2.20.1 2.20.1