Merge pull request #14536 from keyosk/roof-removal-poh-fixes

Roof removal poh fixes
This commit is contained in:
Adam
2021-12-31 14:54:42 -05:00
committed by GitHub

View File

@@ -99,6 +99,7 @@ public class RoofRemovalPlugin extends Plugin
@Override @Override
public void startUp() throws IOException public void startUp() throws IOException
{ {
buildConfigOverrides();
loadRoofOverrides(); loadRoofOverrides();
clientThread.invoke(() -> clientThread.invoke(() ->
{ {
@@ -247,9 +248,14 @@ public class RoofRemovalPlugin extends Plugin
outer: outer:
for (int regionID : client.getMapRegions()) for (int regionID : client.getMapRegions())
{ {
if (configOverrideRegions.contains(regionID))
{
regionsHaveOverrides = true;
break;
}
for (int z = 0; z < Constants.MAX_Z; z++) for (int z = 0; z < Constants.MAX_Z; z++)
{ {
if (overrides.containsKey(regionID << 2 | z) || configOverrideRegions.contains(regionID)) if (overrides.containsKey(regionID << 2 | z))
{ {
regionsHaveOverrides = true; regionsHaveOverrides = true;
break outer; break outer;