From a6eb44376c8037d47d6c649aa91fe19b6a825366 Mon Sep 17 00:00:00 2001
From: broccolai <me@broccol.ai>
Date: Thu, 28 Jan 2021 09:41:17 +0000
Subject: [PATCH] Fix tuple#toArray implementations

---
 CHANGELOG.md                                              | 3 +++
 .../java/cloud/commandframework/types/tuples/Quartet.java | 4 ++--
 .../java/cloud/commandframework/types/tuples/Quintet.java | 6 +++---
 .../java/cloud/commandframework/types/tuples/Sextet.java  | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc1e132f..c6fe0494 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
  - Deprecated old JDA UserParser that did not take an isolation parameter 
+ 
+### Fixed
+ - Tuple implementations now do not throw an error when using the toArray method
 
 ## [1.4.0] - 2021-01-16
 
diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java
index 154c8571..8ce802f3 100644
--- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java
+++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java
@@ -147,8 +147,8 @@ public class Quartet<U, V, W, X> implements Tuple {
         final Object[] array = new Object[4];
         array[0] = this.first;
         array[1] = this.second;
-        array[3] = this.third;
-        array[4] = this.fourth;
+        array[2] = this.third;
+        array[3] = this.fourth;
         return array;
     }
 
diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java
index 6f9d1d3d..1658f19b 100644
--- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java
+++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java
@@ -164,9 +164,9 @@ public class Quintet<U, V, W, X, Y> implements Tuple {
         final Object[] array = new Object[5];
         array[0] = this.first;
         array[1] = this.second;
-        array[3] = this.third;
-        array[4] = this.fourth;
-        array[5] = this.fifth;
+        array[2] = this.third;
+        array[3] = this.fourth;
+        array[4] = this.fifth;
         return array;
     }
 
diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java
index 602c3f2a..2b1dc152 100644
--- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java
+++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java
@@ -183,10 +183,10 @@ public class Sextet<U, V, W, X, Y, Z> implements Tuple {
         final Object[] array = new Object[6];
         array[0] = this.first;
         array[1] = this.second;
-        array[3] = this.third;
-        array[4] = this.fourth;
-        array[5] = this.fifth;
-        array[6] = this.sixth;
+        array[2] = this.third;
+        array[3] = this.fourth;
+        array[4] = this.fifth;
+        array[5] = this.sixth;
         return array;
     }