SteamWar/BauSystem2.0
Archiviert
12
0

QOL #203

Zusammengeführt
YoyoNow hat 44 Commits von QOL nach master 2023-10-06 14:59:48 +02:00 zusammengeführt
Nur Änderungen aus Commit b1cd4604eb werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -92,11 +92,14 @@ public class EntityShowMode implements ShowMode<TNTPosition> {
return; return;
} }
boolean exploded = position.getRecord().getPositions().stream().anyMatch(TNTPosition::isExploded);
boolean hideWater = !showModeParameter.isWater() && exploded && checkWater(position.getLocation());
if (showModeParameter.isExplodeOnly()) { if (showModeParameter.isExplodeOnly()) {
if (position.isExploded()) { if (position.isExploded()) {
generatePositions(position, false, false); generatePositions(position, false, false);
} }
if (!showModeParameter.isSourceOnly()) { if (!showModeParameter.isSourceOnly() && !hideWater) {
return; return;
} }
} }
@ -105,11 +108,13 @@ public class EntityShowMode implements ShowMode<TNTPosition> {
if (position.isSource()) { if (position.isSource()) {
generatePositions(position, false, false); generatePositions(position, false, false);
} }
if (!hideWater) {
return; return;
} }
}
boolean exploded = position.getRecord().getPositions().stream().anyMatch(TNTPosition::isExploded);
if (!showModeParameter.isWater() && exploded && checkWater(position.getLocation())) { if (hideWater) {
if (position.isExploded()) { if (position.isExploded()) {
for (TNTPosition pos : position.getRecord().getPositions()) { for (TNTPosition pos : position.getRecord().getPositions()) {
generatePositions(pos, showModeParameter.isInterpolateY(), showModeParameter.isInterpolateXZ(), (positionType, vector) -> { generatePositions(pos, showModeParameter.isInterpolateY(), showModeParameter.isInterpolateXZ(), (positionType, vector) -> {