Skip to content

Commit 66a2324

Browse files
committed
refactor: apply line wrapping to equals and hashCode methods in TrialSpawnerStateMock and VaultStateMock
1 parent 9774e25 commit 66a2324

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

src/main/java/org/mockmc/mockmc/block/state/TrialSpawnerStateMock.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,19 @@ public boolean equals(Object o)
208208
{
209209
return false;
210210
}
211-
return cooldownEnd == that.cooldownEnd && cooldownLength == that.cooldownLength && nextSpawnAttempt == that.nextSpawnAttempt && requiredPlayerRange == that.requiredPlayerRange && ominous == that.ominous && java.util.Objects.equals(normalConfiguration, that.normalConfiguration) && java.util.Objects.equals(ominousConfiguration, that.ominousConfiguration) && java.util.Objects.equals(trackedPlayers, that.trackedPlayers) && java.util.Objects.equals(trackedEntities, that.trackedEntities);
211+
return cooldownEnd == that.cooldownEnd && cooldownLength == that.cooldownLength
212+
&& nextSpawnAttempt == that.nextSpawnAttempt && requiredPlayerRange == that.requiredPlayerRange
213+
&& ominous == that.ominous && java.util.Objects.equals(normalConfiguration, that.normalConfiguration)
214+
&& java.util.Objects.equals(ominousConfiguration, that.ominousConfiguration)
215+
&& java.util.Objects.equals(trackedPlayers, that.trackedPlayers)
216+
&& java.util.Objects.equals(trackedEntities, that.trackedEntities);
212217
}
213218

214219
@Override
215220
public int hashCode()
216221
{
217-
return java.util.Objects.hash(super.hashCode(), normalConfiguration, ominousConfiguration, cooldownEnd, cooldownLength, nextSpawnAttempt, requiredPlayerRange, ominous, trackedPlayers, trackedEntities);
222+
return java.util.Objects.hash(super.hashCode(), normalConfiguration, ominousConfiguration, cooldownEnd,
223+
cooldownLength, nextSpawnAttempt, requiredPlayerRange, ominous, trackedPlayers, trackedEntities);
218224
}
219225

220226
}

src/main/java/org/mockmc/mockmc/block/state/VaultStateMock.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,22 @@ public boolean equals(Object o)
210210
{
211211
return false;
212212
}
213-
return Double.compare(activationRange, that.activationRange) == 0 && Double.compare(deactivationRange, that.deactivationRange) == 0 && nextStateUpdateTime == that.nextStateUpdateTime && java.util.Objects.equals(rewardedPlayers, that.rewardedPlayers) && java.util.Objects.equals(connectedPlayers, that.connectedPlayers) && java.util.Objects.equals(lootTable, that.lootTable) && java.util.Objects.equals(displayedLootTable, that.displayedLootTable) && java.util.Objects.equals(keyItem, that.keyItem) && java.util.Objects.equals(displayedItem, that.displayedItem);
213+
return Double.compare(activationRange, that.activationRange) == 0
214+
&& Double.compare(deactivationRange, that.deactivationRange) == 0
215+
&& nextStateUpdateTime == that.nextStateUpdateTime
216+
&& java.util.Objects.equals(rewardedPlayers, that.rewardedPlayers)
217+
&& java.util.Objects.equals(connectedPlayers, that.connectedPlayers)
218+
&& java.util.Objects.equals(lootTable, that.lootTable)
219+
&& java.util.Objects.equals(displayedLootTable, that.displayedLootTable)
220+
&& java.util.Objects.equals(keyItem, that.keyItem)
221+
&& java.util.Objects.equals(displayedItem, that.displayedItem);
214222
}
215223

216224
@Override
217225
public int hashCode()
218226
{
219-
return java.util.Objects.hash(super.hashCode(), rewardedPlayers, connectedPlayers, lootTable, displayedLootTable, keyItem, displayedItem, activationRange, deactivationRange, nextStateUpdateTime);
227+
return java.util.Objects.hash(super.hashCode(), rewardedPlayers, connectedPlayers, lootTable,
228+
displayedLootTable, keyItem, displayedItem, activationRange, deactivationRange, nextStateUpdateTime);
220229
}
221230

222231
}

0 commit comments

Comments
 (0)