Merge pull request 'swapped stream.peek() to stream.foreach()' (#257) from KillAll-fix into master
Reviewed-on: #257 Reviewed-by: YoyoNow <jwsteam@nidido.de>
Dieser Commit ist enthalten in:
Commit
85c3d7a768
@ -21,9 +21,9 @@ package de.steamwar.bausystem.commands;
|
|||||||
|
|
||||||
import de.steamwar.bausystem.world.regions.*;
|
import de.steamwar.bausystem.world.regions.*;
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.entity.Entity;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
public class CommandKillAll extends SWCommand {
|
public class CommandKillAll extends SWCommand {
|
||||||
@ -48,19 +48,26 @@ public class CommandKillAll extends SWCommand {
|
|||||||
@Register
|
@Register
|
||||||
public void genericCommand(Player player, RegionSelectionType regionSelectionType) {
|
public void genericCommand(Player player, RegionSelectionType regionSelectionType) {
|
||||||
Region region = Region.getRegion(player.getLocation());
|
Region region = Region.getRegion(player.getLocation());
|
||||||
|
AtomicLong removedEntities = new AtomicLong();
|
||||||
if (regionSelectionType == RegionSelectionType.GLOBAL || GlobalRegion.isGlobalRegion(region)) {
|
if (regionSelectionType == RegionSelectionType.GLOBAL || GlobalRegion.isGlobalRegion(region)) {
|
||||||
long removedEntities = WORLD.getEntities()
|
WORLD.getEntities()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(e -> !(e instanceof Player))
|
.filter(e -> !(e instanceof Player))
|
||||||
.peek(Entity::remove).count();
|
.forEach(entity -> {
|
||||||
RegionUtils.actionBar(GlobalRegion.getInstance(), "§a" + removedEntities + " Entities aus der Welt entfernt");
|
entity.remove();
|
||||||
|
removedEntities.getAndIncrement();
|
||||||
|
});
|
||||||
|
RegionUtils.actionBar(GlobalRegion.getInstance(), "§a" + removedEntities.get() + " Entities aus der Welt entfernt");
|
||||||
} else {
|
} else {
|
||||||
long removedEntities = WORLD.getEntities()
|
WORLD.getEntities()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(e -> !(e instanceof Player))
|
.filter(e -> !(e instanceof Player))
|
||||||
.filter(e -> region.inRegion(e.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
|
.filter(e -> region.inRegion(e.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
|
||||||
.peek(Entity::remove).count();
|
.forEach(entity -> {
|
||||||
RegionUtils.actionBar(region, "§a" + removedEntities + " Entities aus der Region entfernt");
|
entity.remove();
|
||||||
|
removedEntities.getAndIncrement();
|
||||||
|
});
|
||||||
|
RegionUtils.actionBar(region, "§a" + removedEntities.get() + " Entities aus der Region entfernt");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren