0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix poor usage of Cloneable

Browse Source 
Because super.clone() isn't being called, the idea of "Cloneable" isn't upheld.
This commit is contained in:
Brady 2019-09-20 09:51:57 -05:00
parent fc43ef9308
commit eaa426dd66
No known key found for this signature in database
GPG Key ID: 73A788379A197567
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/java/baritone/api/utils/command/helpers/arguments/ArgConsumer.java
View File

@ -54,7 +54,7 @@ import java.util.stream.Stream;
* handlers can do their job and log the error to chat.</li> * handlers can do their job and log the error to chat.</li>
* </ul> * </ul>
*/ */
public class ArgConsumer implements Cloneable { public class ArgConsumer {
/** /**
* The list of arguments in this ArgConsumer * The list of arguments in this ArgConsumer
@ -410,7 +410,7 @@ public class ArgConsumer implements Cloneable {
* @see IDatatype * @see IDatatype
*/ */
public <T extends IDatatype> T peekDatatype(Class<T> datatype) { public <T extends IDatatype> T peekDatatype(Class<T> datatype) {
return clone().getDatatype(datatype); return copy().getDatatype(datatype);
} }
/** /**
@ -427,7 +427,7 @@ public class ArgConsumer implements Cloneable {
* @see IDatatype * @see IDatatype
*/ */
public <T extends IDatatype> T peekDatatypeOrNull(Class<T> datatype) { public <T extends IDatatype> T peekDatatypeOrNull(Class<T> datatype) {
return clone().getDatatypeOrNull(datatype); return copy().getDatatypeOrNull(datatype);
} }
/** /**
@ -445,7 +445,7 @@ public class ArgConsumer implements Cloneable {
* @see IDatatypePost * @see IDatatypePost
*/ */
public <T, O, D extends IDatatypePost<T, O>> T peekDatatypePost(Class<D> datatype, O original) { public <T, O, D extends IDatatypePost<T, O>> T peekDatatypePost(Class<D> datatype, O original) {
return clone().getDatatypePost(datatype, original); return copy().getDatatypePost(datatype, original);
} }
/** /**
@ -464,7 +464,7 @@ public class ArgConsumer implements Cloneable {
* @see IDatatypePost * @see IDatatypePost
*/ */
public <T, O, D extends IDatatypePost<T, O>> T peekDatatypePostOrDefault(Class<D> datatype, O original, T def) { public <T, O, D extends IDatatypePost<T, O>> T peekDatatypePostOrDefault(Class<D> datatype, O original, T def) {
return clone().getDatatypePostOrDefault(datatype, original, def); return copy().getDatatypePostOrDefault(datatype, original, def);
} }
/** /**
@ -500,7 +500,7 @@ public class ArgConsumer implements Cloneable {
* @see IDatatypeFor * @see IDatatypeFor
*/ */
public <T, D extends IDatatypeFor<T>> T peekDatatypeFor(Class<D> datatype) { public <T, D extends IDatatypeFor<T>> T peekDatatypeFor(Class<D> datatype) {
return clone().peekDatatypeFor(datatype); return copy().peekDatatypeFor(datatype);
} }
/** /**
@ -519,7 +519,7 @@ public class ArgConsumer implements Cloneable {
* @see IDatatypeFor * @see IDatatypeFor
*/ */
public <T, D extends IDatatypeFor<T>> T peekDatatypeForOrDefault(Class<D> datatype, T def) { public <T, D extends IDatatypeFor<T>> T peekDatatypeForOrDefault(Class<D> datatype, T def) {
return clone().peekDatatypeForOrDefault(datatype, def); return copy().peekDatatypeForOrDefault(datatype, def);
} }
/** /**
@ -975,12 +975,10 @@ public class ArgConsumer implements Cloneable {
} }
/** /**
* @return A clone of this {@link ArgConsumer}. It has the same arguments (both consumed and not), but does not * @return A copy of this {@link ArgConsumer}. It has the same arguments (both consumed and not), but does not
* affect or mutate this instance. Useful for the various {@code peek} functions * affect or mutate this instance. Useful for the various {@code peek} functions
*/ */
@SuppressWarnings("MethodDoesntCallSuperMethod") public ArgConsumer copy() {
@Override
public ArgConsumer clone() {
return new ArgConsumer(args, consumed); return new ArgConsumer(args, consumed);
} }