mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-19 05:44:44 +02:00
WE unregistration + home/visit sorting + format
- WorldEdit listener unregistration for external masking/extent/async worldedit management. (wink) - Use the same listing for home and visit as previous behavior was confusing.
This commit is contained in:
@ -293,7 +293,7 @@ public class SpongeMain implements IPlotMain, PluginContainer
|
||||
PS.get().loadWorld(world, wrapper);
|
||||
switch (plotworld.TYPE)
|
||||
{
|
||||
// Normal
|
||||
// Normal
|
||||
case 0:
|
||||
{
|
||||
modify = new WorldModify(generator, false);
|
||||
|
@ -230,18 +230,18 @@ public class AugmentedPopulator implements Populator
|
||||
public void setBlock(final int x, final int y, final int z, final BlockState t)
|
||||
{
|
||||
if (check && (((z) < bz) || ((z) > tz) || ((x) < bx) || ((x) > tx))) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
if (p)
|
||||
{
|
||||
if (ChunkManager.CURRENT_PLOT_CLEAR != null)
|
||||
{
|
||||
if (ChunkManager.CURRENT_PLOT_CLEAR.isIn(x, z)) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (manager.getPlotIdAbs(plotworld, x, 0, z) != null) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
}
|
||||
final PlotBlock block = SpongeMain.THIS.getPlotBlock(t);
|
||||
@ -315,18 +315,18 @@ public class AugmentedPopulator implements Populator
|
||||
public void setBlockType(final int x, final int y, final int z, final BlockType t)
|
||||
{
|
||||
if (check && (((z) < bz) || ((z) > tz) || ((x) < bx) || ((x) > tx))) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
if (p)
|
||||
{
|
||||
if (ChunkManager.CURRENT_PLOT_CLEAR != null)
|
||||
{
|
||||
if (ChunkManager.CURRENT_PLOT_CLEAR.isIn(x, z)) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (manager.getPlotIdAbs(plotworld, x, 0, z) != null) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
}
|
||||
final PlotBlock block = SpongeMain.THIS.getPlotBlock(t.getDefaultState());
|
||||
|
@ -119,7 +119,7 @@ public class MainListener
|
||||
public boolean apply(final org.spongepowered.api.world.Location<World> loc)
|
||||
{
|
||||
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(loc)))) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -323,7 +323,7 @@ public class MainListener
|
||||
public boolean apply(final org.spongepowered.api.world.Location loc)
|
||||
{
|
||||
if (MainUtil.isPlotRoad(SpongeUtil.getLocation(worldname, loc))) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -427,7 +427,7 @@ public class MainListener
|
||||
public boolean apply(final org.spongepowered.api.world.Location loc)
|
||||
{
|
||||
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(loc)))) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -438,7 +438,7 @@ public class MainListener
|
||||
public boolean apply(final Entity entity)
|
||||
{
|
||||
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(entity)))) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -457,7 +457,7 @@ public class MainListener
|
||||
public boolean apply(final Entity entity)
|
||||
{
|
||||
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(entity)))) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -474,7 +474,7 @@ public class MainListener
|
||||
public boolean apply(final org.spongepowered.api.world.Location loc)
|
||||
{
|
||||
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(loc)))) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -485,7 +485,7 @@ public class MainListener
|
||||
public boolean apply(final Entity entity)
|
||||
{
|
||||
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(entity)))) {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user