From 6ee4628d324e4f499319b40c7fd493d912d7f538 Mon Sep 17 00:00:00 2001
From: _Mads <75088349+TFSMads@users.noreply.github.com>
Date: Mon, 1 Jul 2024 15:08:59 +0200
Subject: [PATCH] Added holder instanceof DoubleChest check to converter
 (#6823)

* Added holder instanceof DoubleChest check to IntentoryHolder - Location converter

* Apply suggestions from code review

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>

* Change ternary to if statements

* Fix indentation in test

* Address reviews

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>

* Update src/main/java/ch/njol/skript/classes/data/DefaultConverters.java

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Pikachu920 <28607612+Pikachu920@users.noreply.github.com>
Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>
---
 .../classes/data/DefaultConverters.java       |  8 ++++++++
 ...1-inventory-holder-location-doublechest.sk | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk

diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java b/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java
index 00f419f4901..a90de6957d3 100644
--- a/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java
+++ b/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java
@@ -176,6 +176,14 @@ public DefaultConverters() {}
 				return ((Block) holder).getLocation();
 			if (holder instanceof BlockState)
 				return BlockUtils.getLocation(((BlockState) holder).getBlock());
+			if (holder instanceof DoubleChest) {
+				DoubleChest doubleChest = (DoubleChest) holder;
+				if (doubleChest.getLeftSide() != null) {
+					return BlockUtils.getLocation(((BlockState) doubleChest.getLeftSide()).getBlock());
+				} else if (((DoubleChest) holder).getRightSide() != null) {
+					return BlockUtils.getLocation(((BlockState) doubleChest.getRightSide()).getBlock());
+				}
+			}
 			return null;
 		});
 
diff --git a/src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk b/src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk
new file mode 100644
index 00000000000..f46d4b52794
--- /dev/null
+++ b/src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk
@@ -0,0 +1,20 @@
+test "inventory holder location double chest":
+	set {_b::1} to the block at spawn of world "world"
+	set {_b::2} to the block north of {_b::1}
+	set {_prev::1} to type of block at {_b::1}
+	set {_prev::2} to type of block at {_b::2}
+
+	set block at {_b::1} to chest[facing=east;type=right]
+	set block at {_b::2} to chest[facing=east;type=left]
+
+	set {_inv} to inventory of {_b::1}
+	set {_holder} to holder of {_inv}
+
+	set {_a-loc} to location of {_holder}
+	set {_b-loc::*} to location of {_b::1} and location of {_b::2}
+
+	# clean up first in case assert fails
+	set block at {_b::1} to {_prev::1}
+	set block at {_b::2} to {_prev::2}
+
+	assert {_b-loc::*} contains {_a-loc} with "holder location of double chest differs from block location"