diff --git a/.vscode/launch.json b/.vscode/launch.json index d1cd6d4..26b43b9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,12 +8,12 @@ "name": "Launch Client (Debug)", "type": "coreclr", "request": "launch", - "program": "${env:VINTAGE_STORY}/Vintagestory.exe", + "program": ".game/Vintagestory.exe", "linux": { - "program": "${env:VINTAGE_STORY}/Vintagestory" + "program": ".game/Vintagestory" }, "osx": { - "program": "${env:VINTAGE_STORY}/Vintagestory" + "program": ".game/Vintagestory" }, "preLaunchTask": "build", "args": [ @@ -21,7 +21,7 @@ // "--openWorld" , "modding test world", "--tracelog", "--addModPath", - "${workspaceFolder}/ModTemplate/bin/Debug/Mods" + "${workspaceFolder}/AriasServerUtils/bin/Debug/Mods" ], "console": "internalConsole", "stopAtEntry": false @@ -30,18 +30,18 @@ "name": "Launch Server", "type": "coreclr", "request": "launch", - "program": "${env:VINTAGE_STORY}/VintagestoryServer.exe", + "program": ".game/VintagestoryServer.exe", "linux": { - "program": "${env:VINTAGE_STORY}/VintagestoryServer" + "program": ".game/VintagestoryServer" }, "osx": { - "program": "${env:VINTAGE_STORY}/VintagestoryServer" + "program": ".game/VintagestoryServer" }, "preLaunchTask": "build", "args": [ "--tracelog", "--addModPath", - "${workspaceFolder}/ModTemplate/bin/Debug/Mods" + "${workspaceFolder}/AriasServerUtils/bin/Debug/Mods" ], "console": "internalConsole", "stopAtEntry": false diff --git a/.vscode/settings.json b/.vscode/settings.json index 3535556..fbe5f0e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "dotnet.defaultSolution": "ModTemplate.sln", + "dotnet.defaultSolution": "AriasServerUtils.sln", "files.associations": { "server-*.txt": "log", "client-*.txt": "log" diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3b7b591..8fe9dac 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ "build", "-c", "Debug", - "${workspaceFolder}/ModTemplate/ModTemplate.csproj" + "${workspaceFolder}/AriasServerUtils/AriasServerUtils.csproj" ], "problemMatcher": "$msCompile" }, diff --git a/AriasServerUtils/RTPFactory.cs b/AriasServerUtils/RTPFactory.cs index 61bac29..94a940b 100644 --- a/AriasServerUtils/RTPFactory.cs +++ b/AriasServerUtils/RTPFactory.cs @@ -42,10 +42,10 @@ public class RTPFactory bPos.Y = i; curBlock = iswa.BlockAccessor.GetBlock(bPos); - if (curBlock != null && !curBlock.IsLiquid() && curBlock.MatterState == EnumMatterState.Solid) + if (curBlock.MatterState == EnumMatterState.Solid) { - if (lastBlock != null && lastBlock.MatterState == EnumMatterState.Gas && - lastAboveLast != null && lastAboveLast.MatterState == EnumMatterState.Gas) + if (lastBlock != null && lastBlock.BlockMaterial == EnumBlockMaterial.Air && + lastAboveLast != null && lastAboveLast.BlockMaterial == EnumBlockMaterial.Air) { // Found a valid spot: curBlock is solid, lastBlock & lastAboveLast are gas (air) PPos.X = bPos.X; diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 306dc32..ed36f42 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 03-06-2025 @ 4:58 PM MST", - "version": "1.0.4-dev.6", + "description": "A collection of server utilities\n\nBuild Date: 03-06-2025 @ 5:13 PM MST", + "version": "1.0.4-dev.7", "dependencies": { "game": "" }