From 1e87776acbb1f1c63fd9a5917b44eb2e7f1283a2 Mon Sep 17 00:00:00 2001 From: Doc Date: Sat, 19 Feb 2022 09:36:08 +1100 Subject: [PATCH] SPIGOT-6935: Make Arrow color nullable --- .../org/bukkit/craftbukkit/entity/CraftTippedArrow.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java index 1c0e59e3f..425b5b6c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java @@ -116,11 +116,15 @@ public class CraftTippedArrow extends CraftArrow implements Arrow { @Override public void setColor(Color color) { - getHandle().setFixedColor(color.asRGB()); + int colorRGB = (color == null) ? -1 : color.asRGB(); + getHandle().setFixedColor(colorRGB); } @Override public Color getColor() { + if (getHandle().getColor() <= -1) { + return null; + } return Color.fromRGB(getHandle().getColor()); } }