From e8d6b484b3fd24345c3552f8d307ffb83424f8ea Mon Sep 17 00:00:00 2001 From: Kenneth VanderLinde Date: Mon, 8 May 2023 02:02:19 -0700 Subject: [PATCH 1/2] Allow the lumens overlay and lighting to be toggled by players --- src/main/java/net/rptools/maptool/client/AppActions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/rptools/maptool/client/AppActions.java b/src/main/java/net/rptools/maptool/client/AppActions.java index 2da8b66eaa..d234ee3e02 100644 --- a/src/main/java/net/rptools/maptool/client/AppActions.java +++ b/src/main/java/net/rptools/maptool/client/AppActions.java @@ -1525,7 +1525,7 @@ protected void executeAction() { /** This is the menu option turns the lumens overlay on and off. */ public static final Action TOGGLE_LUMENS_OVERLAY = - new ZoneAdminClientAction() { + new ZoneClientAction() { { init("action.showLumensOverlay"); } @@ -1544,7 +1544,7 @@ protected void executeAction() { /** This is the menu option turns the lumens overlay on and off. */ public static final Action TOGGLE_SHOW_LIGHTS = - new ZoneAdminClientAction() { + new ZoneClientAction() { { init("action.showLights"); } From ba03d34a06645a97dfa6c55a7c944d7e28448be5 Mon Sep 17 00:00:00 2001 From: Kenneth VanderLinde Date: Mon, 8 May 2023 02:11:35 -0700 Subject: [PATCH 2/2] Fix lighting style not being copied to new Zone instances. This is particular visible when starting a server. --- src/main/java/net/rptools/maptool/model/Zone.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/rptools/maptool/model/Zone.java b/src/main/java/net/rptools/maptool/model/Zone.java index 306a7a4fbf..7736e44760 100644 --- a/src/main/java/net/rptools/maptool/model/Zone.java +++ b/src/main/java/net/rptools/maptool/model/Zone.java @@ -494,6 +494,7 @@ public Zone(Zone zone, boolean keepIds) { mapAsset = zone.mapAsset; fogPaint = zone.fogPaint; visionType = zone.visionType; + lightingStyle = zone.lightingStyle; undo = new UndoPerZone(this); // Undo/redo manager isn't copied setName(zone.getName());