TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Don't teleport players; Fixes PS-14

Browse source
This commit is contained in:
PureGero 2020-06-16 01:44:05 +10:00 committed by Alexander Söderberg
parent 6259287dff
commit cb969e37a6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
View file

@ -100,15 +100,15 @@ public class EntitySpawnListener implements Listener {
if (!originWorld.equals(world)) { if (!originWorld.equals(world)) {
if (!ignoreTP) { if (!ignoreTP) {
if (!world.getName().equalsIgnoreCase(originWorld + "_the_end")) { if (!world.getName().equalsIgnoreCase(originWorld + "_the_end")) {
if (entity.getType() == EntityType.PLAYER) {
return;
}
try { try {
ignoreTP = true; ignoreTP = true;
PaperLib.teleportAsync(entity, origin); PaperLib.teleportAsync(entity, origin);
} finally { } finally {
ignoreTP = false; ignoreTP = false;
} }
if (entity.getType() == EntityType.PLAYER) {
return;
}
if (entity.getLocation().getWorld().equals(world)) { if (entity.getLocation().getWorld().equals(world)) {
entity.remove(); entity.remove();
} }