From 1a93f2fc41287662971beea29baf37a9cee69797 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 3 Oct 2023 11:32:20 +0200
Subject: [PATCH] Add -water as for /trace show in WarShip regions

Signed-off-by: yoyosource <yoyosource@nidido.de>
---
 .../bausystem/features/tracer/TraceCommand.java        | 10 +++++++++-
 .../features/tracer/show/ShowModeParameter.java        |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
index dc0cb9ba..0ffe04de 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
@@ -156,9 +156,17 @@ public class TraceCommand extends SWCommand {
     // /trace show raw -auto at 0
     @Register(value = {"show"}, description = "TRACE_COMMAND_HELP_SHOW")
     public void showCommand(@Validator Player p, @OptionalValue("entity") ShowModeType showModeType, ShowModeParameterType... showModeParameterTypes) {
+        Region region = Region.getRegion(p.getLocation());
         ShowModeParameter showModeParameter = new ShowModeParameter();
+        if (region.getWaterLevel() != 0) { // Enable Water by default for regions with WaterLevel e.g. WarShip
+            showModeParameter.enableWater();
+        }
         for (ShowModeParameterType showModeParameterType : showModeParameterTypes) {
-            showModeParameterType.getShowModeParameterConsumer().accept(showModeParameter);
+            if (showModeParameterType == ShowModeParameterType.WATER && region.getWaterLevel() != 0) {
+                showModeParameter.disableWater();
+            } else {
+                showModeParameterType.getShowModeParameterConsumer().accept(showModeParameter);
+            }
         }
         TraceShowManager.show(p, showModeType.showModeBiFunction.apply(p, showModeParameter));
         BauSystem.MESSAGE.send("TRACE_MESSAGE_SHOW", p);
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java
index 6ccc305c..1da942eb 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/ShowModeParameter.java
@@ -38,6 +38,10 @@ public class ShowModeParameter {
     public void enableWater() {
         this.water = true;
     }
+    
+    public void disableWater() {
+        this.water = false;
+    }
 
     public void enableInterpolateY() {
         this.interpolateY = true;