SteamWar/BauSystem
Archiviert
13
0

Merge pull request 'Fix ConcurrentModificationException - 2' (#77) from TNTTracer into master

Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2020-07-19 17:51:50 +02:00
Commit 7da1f7acbb

Datei anzeigen

@ -26,6 +26,7 @@ public class TNTTracer15 {
private static long current = System.currentTimeMillis();
private static boolean removeInWater = true;
private static long lastExplosion = System.currentTimeMillis();
private static World world;
public static void worldInit() {
@ -44,7 +45,7 @@ public class TNTTracer15 {
private static final float[] noValue = new float[0];
public static void initTNTTracer_15() {
TNTTracer_15.init(BauSystem.getPlugin(), TNTTracer15::getTracePoints, TNTTracer15::getTraceUpdatePoints, TNTTracer15::getActionBar, TNTTracer15::showMode, p -> ShowManager.get(p).isDirty(), () -> status == Status.RECORD || status == Status.RECORD_AUTO);
TNTTracer_15.init(BauSystem.getPlugin(), TNTTracer15::getTracePoints, TNTTracer15::getTraceUpdatePoints, TNTTracer15::getActionBar, TNTTracer15::showMode, p -> ShowManager.get(p).isDirty(), () -> System.currentTimeMillis() - lastExplosion > 4500);
}
private static float[] accumulate(LinkedList<TNTTrace> traces) {
@ -264,6 +265,7 @@ public class TNTTracer15 {
static void explode(TNTPrimed tntPrimed) {
if (tntFrames.isEmpty()) return;
lastExplosion = System.currentTimeMillis();
tntFrames.getLast().explode(tntPrimed);
}