Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix IngameListener

Browse Source
This commit is contained in:
YoyoNow
2025-05-18 15:37:43 +02:00
parent 2a314e7035
commit 778d0282d3
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
+14 -10
View File
@@ -27,6 +27,7 @@ import de.steamwar.towerrun.game.TowerRunGame;
import de.steamwar.towerrun.state.GameStateBukkitListener; import de.steamwar.towerrun.state.GameStateBukkitListener;
import de.steamwar.towerrun.state.GameStates; import de.steamwar.towerrun.state.GameStates;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@@ -43,16 +44,18 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
public class IngameListener extends GameStateBukkitListener { public class IngameListener extends GameStateBukkitListener {
private int time = 0; private int time = 0;
private final Map<Integer, List<Pos>> blocksToMelt = new HashMap<>(); private final Map<Pos, Integer> blocksToMelt = new HashMap<>();
private BukkitRunnable blocksToMeltRunnable; private BukkitRunnable blocksToMeltRunnable;
private BukkitRunnable antiCampRunnable; private BukkitRunnable antiCampRunnable;
@AllArgsConstructor @AllArgsConstructor
@EqualsAndHashCode
private class Pos { private class Pos {
private final int x; private final int x;
private final int y; private final int y;
@@ -69,22 +72,22 @@ public class IngameListener extends GameStateBukkitListener {
blocksToMeltRunnable = new BukkitRunnable() { blocksToMeltRunnable = new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
List<Pos> posList = blocksToMelt.remove(time); List<Pos> blocksToBreak = blocksToMelt.entrySet().stream()
.filter(entry -> entry.getValue() == time)
.map(Map.Entry::getKey)
.collect(Collectors.toList());
time++; time++;
if (posList == null) { if (blocksToBreak.isEmpty()) {
return; return;
} }
System.out.println(blocksToMelt.size() + " " + posList.size() + " " + blocksToMelt.values().stream().mapToInt(List::size).sum()); System.out.println(blocksToBreak.size() + "/" + blocksToMelt.size());
int maxBlocks = 1_000; for (Pos pos : blocksToBreak) {
while (maxBlocks > 0 && !posList.isEmpty()) { blocksToMelt.remove(pos);
Pos pos = posList.removeFirst();
Block block = Bukkit.getWorlds().get(0).getBlockAt(pos.x, pos.y, pos.z); Block block = Bukkit.getWorlds().get(0).getBlockAt(pos.x, pos.y, pos.z);
if (block.getType() == Material.AIR || block.getType() == Material.LAVA) continue; if (block.getType() == Material.AIR || block.getType() == Material.LAVA) continue;
block.setType(Material.AIR); block.setType(Material.AIR);
block.getWorld().playSound(block.getLocation(), Sound.BLOCK_FIRE_EXTINGUISH, 0.1F, 1); block.getWorld().playSound(block.getLocation(), Sound.BLOCK_FIRE_EXTINGUISH, 0.1F, 1);
maxBlocks--;
} }
blocksToMelt.computeIfAbsent(time, __ -> new ArrayList<>()).addAll(0, posList);
} }
}; };
blocksToMeltRunnable.runTaskTimer(TowerRun.getInstance(), 0, 1); blocksToMeltRunnable.runTaskTimer(TowerRun.getInstance(), 0, 1);
@@ -264,7 +267,8 @@ public class IngameListener extends GameStateBukkitListener {
default: default:
break; break;
} }
blocksToMelt.computeIfAbsent(time + meltingTime, integer -> new ArrayList<>()).add(new Pos(block.getLocation().getBlockX(), block.getLocation().getBlockY(), block.getLocation().getBlockZ())); Pos pos = new Pos(block.getLocation().getBlockX(), block.getLocation().getBlockY(), block.getLocation().getBlockZ());
blocksToMelt.putIfAbsent(pos, time + meltingTime);
} }
@EventHandler @EventHandler