From 3e94b730bd5879f42ad701fa58aeba0a2776938c Mon Sep 17 00:00:00 2001 From: Zsolt Zitting Date: Mon, 1 Apr 2024 14:40:09 -0700 Subject: [PATCH 1/2] Fixed automod script FileSystemWatcher not resolving a path on network drives --- automod.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automod.ps1 b/automod.ps1 index 6a76f35..db3a7cf 100644 --- a/automod.ps1 +++ b/automod.ps1 @@ -33,7 +33,7 @@ if (!(Test-Path $BeamMPResourcePath)) { # Watcher stuff $Watcher = New-Object System.IO.FileSystemWatcher -$Watcher.Path = $ModPath +$Watcher.Path = Resolve-Path -Path $ModPath $Watcher.NotifyFilter = [System.IO.NotifyFilters]::LastWrite, [System.IO.NotifyFilters]::FileName, [System.IO.NotifyFilters]::DirectoryName $Watcher.Filter = "*.*" $Watcher.IncludeSubdirectories = $true From e2ff340bd055209876d5a06a2f31b9b438658fae Mon Sep 17 00:00:00 2001 From: Zsolt Zitting Date: Mon, 1 Apr 2024 14:41:01 -0700 Subject: [PATCH 2/2] Fixed flood rate being calculated incorrectly --- Resources/Client/floodBeamMP/lua/ge/extensions/floodBeamMP.lua | 2 +- Resources/Server/Flood/flood.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Client/floodBeamMP/lua/ge/extensions/floodBeamMP.lua b/Resources/Client/floodBeamMP/lua/ge/extensions/floodBeamMP.lua index 37fc961..33affef 100644 --- a/Resources/Client/floodBeamMP/lua/ge/extensions/floodBeamMP.lua +++ b/Resources/Client/floodBeamMP/lua/ge/extensions/floodBeamMP.lua @@ -109,7 +109,7 @@ local function onUpdate(dt) end setWaterLevel(newLevel) - serverWaterLevel = serverWaterLevel + ((decreasing and -1 or 1) * floodSpeed * 1000) * dt + serverWaterLevel = serverWaterLevel + ((decreasing and -1 or 1) * floodSpeed) * dt end local function onClientEndMission() diff --git a/Resources/Server/Flood/flood.lua b/Resources/Server/Flood/flood.lua index 7084aa0..486efd6 100644 --- a/Resources/Server/Flood/flood.lua +++ b/Resources/Server/Flood/flood.lua @@ -119,7 +119,7 @@ function T_Update() if not M.isOceanValid or not M.options.enabled then return end local level = M.options.oceanLevel - local changeAmount = UPDATE_TIME * M.options.floodSpeed + local changeAmount = M.options.floodSpeed local limit = M.options.limit local decrease = M.options.decrease local resetAt = M.options.resetAt