diff --git a/src/com/massivecraft/massivecore/Couple.java b/src/com/massivecraft/massivecore/Couple.java
index 44d63e2a..c969d5a8 100644
--- a/src/com/massivecraft/massivecore/Couple.java
+++ b/src/com/massivecraft/massivecore/Couple.java
@@ -18,10 +18,10 @@ public class Couple implements Entry, Cloneable, Serializable
// -------------------------------------------- //
private final A first;
- public A getFirst() { return this.first; };
+ public A getFirst() { return this.first; }
private final B second;
- public B getSecond() { return this.second; };
+ public B getSecond() { return this.second; }
// -------------------------------------------- //
// FIELDS: WITH
@@ -63,7 +63,7 @@ public class Couple implements Entry, Cloneable, Serializable
}
@Override
- public B setValue(B arg0)
+ public B setValue(B value)
{
throw new IllegalStateException("This entry is a couple which is immutable.");
}
@@ -82,12 +82,14 @@ public class Couple implements Entry, Cloneable, Serializable
// -------------------------------------------- //
@Override
- public boolean equals(Object derpObject)
+ public boolean equals(Object object)
{
- if (derpObject == null) return false;
- if (!(derpObject instanceof Couple, ?>)) return false;
- Couple, ?> derp = (Couple, ?>)derpObject;
- return MUtil.equals(this.getFirst(), derp.getFirst()) && MUtil.equals(this.getSecond(), derp.getSecond());
+ if (!(object instanceof Couple, ?>)) return false;
+ Couple, ?> that = (Couple, ?>)object;
+ return MUtil.equals(
+ this.getFirst(), that.getFirst(),
+ this.getSecond(), that.getSecond()
+ );
}
// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/Triple.java b/src/com/massivecraft/massivecore/Triple.java
index 2106fb87..2644a0f6 100644
--- a/src/com/massivecraft/massivecore/Triple.java
+++ b/src/com/massivecraft/massivecore/Triple.java
@@ -63,12 +63,15 @@ public class Triple implements Cloneable, Serializable
// -------------------------------------------- //
@Override
- public boolean equals(Object derpObject)
+ public boolean equals(Object object)
{
- if (derpObject == null) return false;
- if (!(derpObject instanceof Triple, ?, ?>)) return false;
- Triple, ?, ?> derp = (Triple, ?, ?>)derpObject;
- return MUtil.equals(this.getFirst(), derp.getFirst()) && MUtil.equals(this.getSecond(), derp.getSecond()) && MUtil.equals(this.getThird(), derp.getThird());
+ if (!(object instanceof Triple, ?, ?>)) return false;
+ Triple, ?, ?> that = (Triple, ?, ?>)object;
+ return MUtil.equals(
+ this.getFirst(), that.getFirst(),
+ this.getSecond(), that.getSecond(),
+ this.getThird(), that.getThird()
+ );
}
// -------------------------------------------- //