From f382bd16d0d2ca9fe0b8ab8f85f03401a37d4b50 Mon Sep 17 00:00:00 2001 From: Alexander Noyle Date: Thu, 23 Jul 2026 16:53:20 -0400 Subject: [PATCH] Harden disabled virtual display self-test --- .../quickshop/util/envcheck/EnvironmentChecker.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/envcheck/EnvironmentChecker.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/envcheck/EnvironmentChecker.java index c5629a425..146de695d 100644 --- a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/envcheck/EnvironmentChecker.java +++ b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/envcheck/EnvironmentChecker.java @@ -510,7 +510,7 @@ public final class EnvironmentChecker { @EnvCheckEntry(name = "Virtual DisplayItem Support Test", priority = 7, stage = EnvCheckEntry.Stage.AFTER_ON_ENABLE) public ResultContainer virtualDisplayWorkingTest() { - if (!plugin.isDisplayEnabled()) { + if (!plugin.isDisplayEnabled() || !plugin.getConfig().getBoolean("shop.display-items")) { return new ResultContainer(CheckResult.PASSED, "The display are disabled."); @@ -522,7 +522,8 @@ public final class EnvironmentChecker { } - if (plugin.getVirtualDisplayItemManager() == null) { + var virtualDisplayItemManager = plugin.getVirtualDisplayItemManager(); + if (virtualDisplayItemManager == null) { AbstractDisplayItem.setVirtualDisplayDoesntWork(true); return new ResultContainer(CheckResult.WARNING, @@ -530,10 +531,10 @@ public final class EnvironmentChecker { } - Throwable testResult = plugin.getVirtualDisplayItemManager().getPacketFactory().testFakeItem(); + Throwable testResult = virtualDisplayItemManager.getPacketFactory().testFakeItem(); if (testResult != null) { - plugin.getVirtualDisplayItemManager().setTestPassed(false); + virtualDisplayItemManager.setTestPassed(false); AbstractDisplayItem.setVirtualDisplayDoesntWork(true); plugin.logger().warn("Failed to load the VirtualDisplayItem, self-test failure", testResult); return new ResultContainer(CheckResult.WARNING, -- 2.47.3