From 3fb667244d05d9138046d5fc5b94fe39d323b69a Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Thu, 2 Jul 2020 08:24:03 -0700 Subject: [PATCH] fix with_hue/saturation/brightness good ol' java having undocumented extra data in returned values --- .../denizen/events/player/PlayerDropsItemScriptEvent.java | 1 - .../main/java/com/denizenscript/denizen/objects/ColorTag.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java index cbf855f63f..0f63d0a2e1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java @@ -61,7 +61,6 @@ public boolean couldMatch(ScriptPath path) { @Override public boolean matches(ScriptPath path) { - String iCheck = path.eventArgLowerAt(2); if (!iCheck.equals("item") && !tryItem(item, iCheck)) { return false; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java index 4f44c0c605..121d398d2a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java @@ -401,7 +401,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) { } public static ColorTag fromHSB(int[] hsv) { - int rgb = java.awt.Color.HSBtoRGB(hsv[0] / 255f, hsv[1] / 255f, hsv[2] / 255f); + int rgb = java.awt.Color.HSBtoRGB(hsv[0] / 255f, hsv[1] / 255f, hsv[2] / 255f) & 0x00ffffff; return new ColorTag(Color.fromRGB(rgb)); }