Merge branch 'v6' into v7

This commit is contained in:
dordsor21 2022-06-16 15:26:03 +01:00
commit 8afcaccb8a
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B

View File

@ -30,6 +30,7 @@ import com.plotsquared.core.events.PlotComponentSetEvent;
import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.PlotMergeEvent;
import com.plotsquared.core.events.PlotUnlinkEvent; import com.plotsquared.core.events.PlotUnlinkEvent;
import com.plotsquared.core.events.Result; import com.plotsquared.core.events.Result;
import com.plotsquared.core.generator.ClassicPlotWorld;
import com.plotsquared.core.generator.SquarePlotWorld; import com.plotsquared.core.generator.SquarePlotWorld;
import com.plotsquared.core.inject.factory.ProgressSubscriberFactory; import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
import com.plotsquared.core.location.Direction; import com.plotsquared.core.location.Direction;
@ -250,6 +251,9 @@ public final class PlotModificationManager {
manager.unClaimPlot(current, null, queue); manager.unClaimPlot(current, null, queue);
} else { } else {
manager.claimPlot(current, queue); manager.claimPlot(current, queue);
if (plot.getArea() instanceof ClassicPlotWorld cpw) {
manager.setComponent(current.getId(), "wall", cpw.WALL_FILLING.toPattern(), actor, queue);
}
} }
} }
if (queue.size() > 0) { if (queue.size() > 0) {