Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-02 04:58:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to remove players. Fixes #2742.

Browse Source
This commit is contained in:
Alexander Söderberg 2020-04-07 20:56:43 +02:00
parent 7841ee3dcc
commit e4a6bd0ca5
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
View File

@ -39,7 +39,7 @@ public class EntitySpawnListener implements Listener {
private static boolean hasPlotArea = false;
private static String areaName = null;
public static void testNether(Entity entity) {
public static void testNether(final Entity entity) {
@NotNull World world = entity.getWorld();
if (world.getEnvironment() != World.Environment.NETHER
&& world.getEnvironment() != World.Environment.THE_END) {
@ -48,15 +48,15 @@ public class EntitySpawnListener implements Listener {
test(entity);
}
public static void testCreate(Entity entity) {
public static void testCreate(final Entity entity) {
@NotNull World world = entity.getWorld();
if (areaName == world.getName()) {
} else {
if (!areaName.equals(world.getName())) {
areaName = world.getName();
hasPlotArea = PlotSquared.get().hasPlotArea(areaName);
}
if (!hasPlotArea)
if (!hasPlotArea) {
return;
}
test(entity);
}
@ -76,15 +76,21 @@ public class EntitySpawnListener implements Listener {
if (!world.getName().equalsIgnoreCase(originWorld + "_the_end")) {
try {
ignoreTP = true;
PaperLib.teleportAsync(entity,origin);
PaperLib.teleportAsync(entity, origin);
} finally {
ignoreTP = false;
}
if (entity.getType() == EntityType.PLAYER) {
return;
}
if (entity.getLocation().getWorld().equals(world)) {
entity.remove();
}
}
} else {
if (entity.getType() == EntityType.PLAYER) {
return;
}
entity.remove();
}
}
@ -136,7 +142,7 @@ public class EntitySpawnListener implements Listener {
@EventHandler public void onChunkLoad(ChunkLoadEvent event) {
@NotNull Chunk chunk = event.getChunk();
for (Entity entity : chunk.getEntities()) {
for (final Entity entity : chunk.getEntities()) {
testCreate(entity);
}
}