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

_Actually_ fix the Lecturn getHolder CCE this time :3

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-07 22:07:13 -05:00
parent 65350c267f
commit 89d08f0416
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/api/0013-Fix-LecternInventory-getHolder-throwing-ClassCastExc.patch
View File

@@ -1,25 +0,0 @@
From 05669278713b7b6fd6f326a03cd9433f7cf04500 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 7 Jun 2019 21:54:48 -0500
Subject: [PATCH] Fix LecternInventory getHolder throwing ClassCastException
---
src/main/java/org/bukkit/block/Lectern.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/block/Lectern.java b/src/main/java/org/bukkit/block/Lectern.java
index 78107207..4d31f091 100644
--- a/src/main/java/org/bukkit/block/Lectern.java
+++ b/src/main/java/org/bukkit/block/Lectern.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Represents a captured state of a lectern.
*/
-public interface Lectern extends TileState, BlockInventoryHolder {
+public interface Lectern extends TileState, Container { // Purpur - fix ClassCastException on LecternInventory#getHolder()
/**
* Get the current lectern page.
--
2.20.1

24
patches/server/0031-Fix-LecternInventory-getHolder-throwing-ClassCastExc.patch Normal file
View File

@@ -0,0 +1,24 @@
From de4643a0287b714b5f74697be07f8ad2a358a62c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 7 Jun 2019 22:05:03 -0500
Subject: [PATCH] Fix LecternInventory getHolder throwing ClassCastException
---
.../org/bukkit/craftbukkit/inventory/CraftInventoryLectern.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLectern.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLectern.java
index f60ed85ef..a14ad6a0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLectern.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLectern.java
@@ -12,6 +12,6 @@ public class CraftInventoryLectern extends CraftInventory implements LecternInve
@Override
public Lectern getHolder() {
- return (Lectern) inventory.getOwner();
+ return (Lectern) ((CraftBlockInventoryHolder) inventory.getOwner()).getBlock(); // Purpur
}
}
--
2.20.1