Fixed BooleanElement

timtomtim7 · Aug 7, 2017 · 7a5e7a7 · 7a5e7a7
1 parent 39902d4
commit 7a5e7a7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/java/me/tom/sparse/spigot/chat/menu/element/BooleanElement.java b/src/main/java/me/tom/sparse/spigot/chat/menu/element/BooleanElement.java
@@ -104,7 +104,7 @@ public void setTrueColor(ChatColor trueColor)
 
 	public int getWidth()
 	{
-		return 8 + (showText ? ChatMenuAPI.getWidth(" " + value) : 0);
+		return 8 + (showText ? ChatMenuAPI.getWidth(" " + value.current()) : 0);
 	}
 
 	public int getHeight()

diff --git a/src/main/java/me/tom/sparse/spigot/chat/util/State.java b/src/main/java/me/tom/sparse/spigot/chat/util/State.java
@@ -83,4 +83,27 @@ public void onChange(Consumer<State<V>> changeCallback)
 	{
 		this.changeCallback = changeCallback;
 	}
+
+	public boolean equals(Object o)
+	{
+		if(this == o) return true;
+		if(!(o instanceof State)) return false;
+
+		State<?> state = (State<?>) o;
+
+		return current != null ? current.equals(state.current) : state.current == null;
+	}
+
+	public int hashCode()
+	{
+		return current != null ? current.hashCode() : 0;
+	}
+
+	public String toString()
+	{
+		return "State{" +
+				"current=" + current +
+				", previous=" + previous +
+				'}';
+	}
 }