From a0e96fca35396b9069ba8a9e3a8deeaa556824d4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 3 Aug 2021 16:21:19 +0100 Subject: [PATCH] Fixed typo --- .../src/main/java/com/willfp/eco/core/display/Display.java | 4 ++++ .../willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java | 6 +++--- .../willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/display/Display.java b/eco-api/src/main/java/com/willfp/eco/core/display/Display.java index b7fa8cad..b8ed7dfb 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/display/Display.java +++ b/eco-api/src/main/java/com/willfp/eco/core/display/Display.java @@ -1,7 +1,9 @@ package com.willfp.eco.core.display; +import com.willfp.eco.core.fast.FastItemStack; import lombok.experimental.UtilityClass; import org.apache.commons.lang.Validate; +import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -75,6 +77,8 @@ public class Display { return itemStack; // return early if there's no customization of the item } + Bukkit.getLogger().info(FastItemStack.wrap(itemStack).isModifyingInstance() ? "CIS!" : "Not CIS :("); + Map pluginVarArgs = new HashMap<>(); for (DisplayPriority priority : DisplayPriority.values()) { diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java index c148e5a1..eaba5643 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java +++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java @@ -17,11 +17,11 @@ import java.util.Map; public class EcoFastItemStack implements FastItemStack { private final ItemStack handle; - private final boolean isCMS; + private final boolean isCIS; public EcoFastItemStack(@NotNull final org.bukkit.inventory.ItemStack itemStack) { this.handle = FastItemStackUtils.getNMSStack(itemStack); - this.isCMS = itemStack instanceof CraftItemStack; + this.isCIS = itemStack instanceof CraftItemStack; } @Override @@ -66,6 +66,6 @@ public class EcoFastItemStack implements FastItemStack { @Override public boolean isModifyingInstance() { - return isCMS; + return isCIS; } } diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java index 62be6e31..2ca01610 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java +++ b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java @@ -17,11 +17,11 @@ import java.util.Map; public class EcoFastItemStack implements FastItemStack { private final ItemStack handle; - private final boolean isCMS; + private final boolean isCIS; public EcoFastItemStack(@NotNull final org.bukkit.inventory.ItemStack itemStack) { this.handle = FastItemStackUtils.getNMSStack(itemStack); - this.isCMS = itemStack instanceof CraftItemStack; + this.isCIS = itemStack instanceof CraftItemStack; } @Override @@ -66,6 +66,6 @@ public class EcoFastItemStack implements FastItemStack { @Override public boolean isModifyingInstance() { - return isCMS; + return isCIS; } }