Skip to content

Commit 1160def

Browse files
authored
Merge pull request #40 from Arctic-Gaming-LLC/pentlock1-patch-1
Changed ArrayUtil to support limited arrays of 50 max
2 parents eb0d32d + 2745fa0 commit 1160def

File tree

2 files changed

+53
-41
lines changed

2 files changed

+53
-41
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.pentlock</groupId>
88
<artifactId>ThunderDataEngine</artifactId>
9-
<version>0.2.12</version>
9+
<version>0.2.13</version>
1010
<packaging>jar</packaging>
1111

1212
<name>ThunderDataEngine</name>

src/main/java/net/pentlock/thunderdataengine/utilities/ArrayUtil.java

Lines changed: 52 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ public class ArrayUtil {
1616

1717
public static String[] addToArray(String[] oldArray, String value) {
1818

19-
String[] newArray = new String[oldArray.length + 1];
20-
21-
for (int i = 0; i < oldArray.length + 1;) {
22-
23-
if (i < oldArray.length) {
24-
newArray[i] = oldArray[i];
25-
} else {
26-
newArray[i] = value;
27-
}
19+
int length;
20+
String[] newArray;
21+
if (oldArray.length + 1 >= 50) {
22+
newArray = new String[50];
23+
length = 50;
24+
} else {
25+
length = oldArray.length;
26+
newArray = new String[length + 1];
27+
}
28+
newArray[0] = value;
29+
for (int i = 0; i < length;) {
30+
newArray[i + 1] = oldArray[i];
2831
i++;
2932
}
3033
return newArray;
@@ -39,17 +42,20 @@ public static String[] addToArray(String[] oldArray, String value) {
3942
* @param value The values that an array is adding to
4043
* @return Array of object type
4144
*/
42-
public static Long[] addToArray(Long[] oldArray, long value) {
43-
44-
Long[] newArray = new Long[oldArray.length + 1];
45-
46-
for (int i = 0; i < oldArray.length + 1;) {
47-
48-
if (i < oldArray.length) {
49-
newArray[i] = oldArray[i];
50-
} else {
51-
newArray[i] = value;
52-
}
45+
public static long[] addToArray(long[] oldArray, long value) {
46+
47+
int length;
48+
long[] newArray;
49+
if (oldArray.length + 1 >= 50) {
50+
newArray = new long[50];
51+
length = 50;
52+
} else {
53+
length = oldArray.length;
54+
newArray = new long[length + 1];
55+
}
56+
newArray[0] = value;
57+
for (int i = 0; i < length;) {
58+
newArray[i + 1] = oldArray[i];
5359
i++;
5460
}
5561

@@ -67,15 +73,18 @@ public static Long[] addToArray(Long[] oldArray, long value) {
6773
*/
6874
public static double[] addToArray(double[] oldArray, double value) {
6975

70-
double[] newArray = new double[oldArray.length + 1];
71-
72-
for (int i = 0; i < oldArray.length + 1;) {
73-
74-
if (i < oldArray.length) {
75-
newArray[i] = oldArray[i];
76-
} else {
77-
newArray[i] = value;
78-
}
76+
int length;
77+
double[] newArray;
78+
if (oldArray.length + 1 >= 50) {
79+
newArray = new double[50];
80+
length = 50;
81+
} else {
82+
length = oldArray.length;
83+
newArray = new double[length + 1];
84+
}
85+
newArray[0] = value;
86+
for (int i = 0; i < length;) {
87+
newArray[i + 1] = oldArray[i];
7988
i++;
8089
}
8190

@@ -93,15 +102,18 @@ public static double[] addToArray(double[] oldArray, double value) {
93102
*/
94103
public static UUID[] addToArray(UUID[] oldArray, UUID value) {
95104

96-
UUID[] newArray = new UUID[oldArray.length + 1];
97-
98-
for (int i = 0; i < oldArray.length + 1;) {
99-
100-
if (i < oldArray.length) {
101-
newArray[i] = oldArray[i];
102-
} else {
103-
newArray[i] = value;
104-
}
105+
int length;
106+
UUID[] newArray;
107+
if (oldArray.length + 1 >= 50) {
108+
newArray = new UUID[50];
109+
length = 50;
110+
} else {
111+
length = oldArray.length;
112+
newArray = new UUID[length + 1];
113+
}
114+
newArray[0] = value;
115+
for (int i = 0; i < length;) {
116+
newArray[i + 1] = oldArray[i];
105117
i++;
106118
}
107119

@@ -117,9 +129,9 @@ public static UUID[] addToArray(UUID[] oldArray, UUID value) {
117129
* @param value The values that an array is removing from
118130
* @return Array of object type
119131
*/
120-
public static Long[] removeFromArray(Long[] oldArray, long value) {
132+
public static long[] removeFromArray(long[] oldArray, long value) {
121133

122-
Long[] newArray = new Long[oldArray.length - 1];
134+
long[] newArray = new long[oldArray.length - 1];
123135
int y = 0;
124136
for (int i = 0; i < oldArray.length - 1;) {
125137

0 commit comments

Comments
 (0)