Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-01-10 10:17:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix some checktyle issue in WorldPurger

Browse Source
This commit is contained in:
Ben Woo 2023-09-11 16:47:39 +08:00
parent e318f1e86f
commit aa063007e8
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldPurger.java
View File

@ -22,6 +22,7 @@ import org.jvnet.hk2.annotations.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Objects;
// TODO: This entire class is a mess. // TODO: This entire class is a mess.
/** /**
@ -84,8 +85,12 @@ public class WorldPurger {
* @param negateMonsters Whether the animals in the list should be negated. * @param negateMonsters Whether the animals in the list should be negated.
* @param sender The {@link CommandSender} that initiated the action. He will/should be notified. * @param sender The {@link CommandSender} that initiated the action. He will/should be notified.
*/ */
public void purgeWorld(@Nullable LoadedMultiverseWorld world, @NotNull List<String> thingsToKill, public void purgeWorld(
boolean negateAnimals, boolean negateMonsters, CommandSender sender) { @Nullable LoadedMultiverseWorld world,
@NotNull List<String> thingsToKill,
boolean negateAnimals,
boolean negateMonsters,
CommandSender sender) {
if (world == null) { if (world == null) {
return; return;
} }
@ -115,7 +120,7 @@ public class WorldPurger {
final Iterator<Projectile> it = projectiles.iterator(); final Iterator<Projectile> it = projectiles.iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Projectile p = it.next(); final Projectile p = it.next();
if (p.getShooter().equals(e)) { if (Objects.equals(p.getShooter(), e)) {
p.remove(); p.remove();
it.remove(); it.remove();
projectilesKilled++; projectilesKilled++;
@ -161,11 +166,22 @@ public class WorldPurger {
boolean specifiedAll = thingsToKill.contains("ALL"); boolean specifiedAll = thingsToKill.contains("ALL");
boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll; boolean specifiedAnimals = thingsToKill.contains("ANIMALS") || specifiedAll;
boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll; boolean specifiedMonsters = thingsToKill.contains("MONSTERS") || specifiedAll;
return this.killDecision(entity, thingsToKill, negateAnimals, negateMonsters, specifiedAnimals, specifiedMonsters); return this.killDecision(
entity,
thingsToKill,
negateAnimals,
negateMonsters,
specifiedAnimals,
specifiedMonsters);
} }
private boolean killDecision(Entity entity, List<String> thingsToKill, boolean negateAnimals, private boolean killDecision(
boolean negateMonsters, boolean specifiedAnimals, boolean specifiedMonsters) { Entity entity,
List<String> thingsToKill,
boolean negateAnimals,
boolean negateMonsters,
boolean specifiedAnimals,
boolean specifiedMonsters) {
boolean negate = false; boolean negate = false;
boolean specified = false; boolean specified = false;
if (entity instanceof Golem if (entity instanceof Golem
@ -178,8 +194,9 @@ public class WorldPurger {
entity.getWorld().getName(), entity); entity.getWorld().getName(), entity);
return true; return true;
} }
if (specifiedAnimals) if (specifiedAnimals) {
specified = true; specified = true;
}
negate = negateAnimals; negate = negateAnimals;
} else if (entity instanceof Monster } else if (entity instanceof Monster
|| entity instanceof Ghast || entity instanceof Ghast
@ -191,8 +208,9 @@ public class WorldPurger {
entity.getWorld().getName(), entity); entity.getWorld().getName(), entity);
return true; return true;
} }
if (specifiedMonsters) if (specifiedMonsters) {
specified = true; specified = true;
}
negate = negateMonsters; negate = negateMonsters;
} }
for (String s : thingsToKill) { for (String s : thingsToKill) {
@ -200,7 +218,8 @@ public class WorldPurger {
if (type != null && type.equals(entity.getType())) { if (type != null && type.equals(entity.getType())) {
specified = true; specified = true;
if (!negate) { if (!negate) {
Logging.finest("Removing an entity because it WAS specified and we are NOT negating in world %s: %s", Logging.finest(
"Removing an entity because it WAS specified and we are NOT negating in world %s: %s",
entity.getWorld().getName(), entity); entity.getWorld().getName(), entity);
return true; return true;
} }