SteamWar/BauSystem2.0
Archiviert
12
0

tracer/simulator-autotrace-fix #245

Zusammengeführt
Chaoscaot hat 2 Commits von tracer/simulator-autotrace-fix nach master 2024-04-29 21:43:21 +02:00 zusammengeführt
2 geänderte Dateien mit 5 neuen und 3 gelöschten Zeilen
Nur Änderungen aus Commit a116f7e4b1 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -113,9 +113,9 @@ public class TraceRecorder implements Listener {
public void stopRecording(Region region) { public void stopRecording(Region region) {
TraceRecordingWrapper wrappedTrace = activeTraces.getOrDefault(region, null); TraceRecordingWrapper wrappedTrace = activeTraces.getOrDefault(region, null);
if (wrappedTrace == null) return; if (wrappedTrace == null) return;
System.out.println(wrappedTrace);
wrappedTrace.finalizeRecording(); wrappedTrace.finalizeRecording();
activeTraces.remove(region); activeTraces.remove(region);
for (TNTPrimed tnt : trackedTNT.getOrDefault(region, Collections.emptyList())) { for (TNTPrimed tnt : trackedTNT.getOrDefault(region, Collections.emptyList())) {
historyMap.remove(tnt); historyMap.remove(tnt);
@ -132,6 +132,7 @@ public class TraceRecorder implements Listener {
Iterator<TNTPrimed> iter = trackedTNT.getOrDefault(region, Collections.emptyList()).iterator(); Iterator<TNTPrimed> iter = trackedTNT.getOrDefault(region, Collections.emptyList()).iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
TNTPrimed tnt = iter.next(); TNTPrimed tnt = iter.next();
if (tnt.getFuseTicks() == 80) continue;
TNTPoint record = record(tnt, wrappedTrace, Collections.emptyList()); TNTPoint record = record(tnt, wrappedTrace, Collections.emptyList());
if (record == null) { if (record == null) {
iter.remove(); iter.remove();
@ -156,6 +157,7 @@ public class TraceRecorder implements Listener {
*/ */
private TNTPoint record(TNTPrimed tntPrimed, TraceRecordingWrapper wrappedTrace, List<Block> destroyedBlocks) { private TNTPoint record(TNTPrimed tntPrimed, TraceRecordingWrapper wrappedTrace, List<Block> destroyedBlocks) {
List<TNTPoint> history = historyMap.getOrDefault(tntPrimed, new ArrayList<>()); List<TNTPoint> history = historyMap.getOrDefault(tntPrimed, new ArrayList<>());
// Failsave for tnt entering unloaded chunks // Failsave for tnt entering unloaded chunks
if (tntPrimed.isDead() || history.size() > 0 && history.get(history.size() - 1).getFuse() == tntPrimed.getFuseTicks()) { if (tntPrimed.isDead() || history.size() > 0 && history.get(history.size() - 1).getFuse() == tntPrimed.getFuseTicks()) {
return null; return null;

Datei anzeigen

@ -1,5 +1,5 @@
name: BauSystem name: BauSystem
authors: [Lixfel, YoyoNow, Chaoscaot, Zeanon] authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ]
version: "2.0" version: "2.0"
depend: [ WorldEdit, SpigotCore ] depend: [ WorldEdit, SpigotCore ]
load: POSTWORLD load: POSTWORLD