mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-22 23:34:44 +02:00
Compare commits
1 Commits
fix/v6/shu
...
renovate/n
Author | SHA1 | Date | |
---|---|---|---|
![]() |
9b3d8f3b39 |
@@ -36,7 +36,6 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
|||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.block.Block;
|
|
||||||
import org.bukkit.entity.ArmorStand;
|
import org.bukkit.entity.ArmorStand;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
@@ -192,32 +191,8 @@ public class EntitySpawnListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onTeleport(EntityTeleportEvent event) {
|
public void onTeleport(EntityTeleportEvent event) {
|
||||||
Entity entity = event.getEntity();
|
Entity ent = event.getEntity();
|
||||||
Entity fromLocation = event.getEntity();
|
if (ent instanceof Vehicle || ent instanceof ArmorStand) {
|
||||||
Block toLocation = event.getTo().getBlock();
|
|
||||||
final Location fromLocLocation = BukkitUtil.adapt(fromLocation.getLocation());
|
|
||||||
final PlotArea fromArea = fromLocLocation.getPlotArea();
|
|
||||||
Location toLocLocation = BukkitUtil.adapt(toLocation.getLocation());
|
|
||||||
PlotArea toArea = toLocLocation.getPlotArea();
|
|
||||||
|
|
||||||
if (toArea == null) {
|
|
||||||
if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
|
|
||||||
event.setCancelled(true);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Plot toPlot = toArea.getOwnedPlot(toLocLocation);
|
|
||||||
if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
|
|
||||||
final Plot fromPlot = fromArea.getOwnedPlot(fromLocLocation);
|
|
||||||
|
|
||||||
if (fromPlot != null || toPlot != null) {
|
|
||||||
if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
|
|
||||||
event.setCancelled(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (entity instanceof Vehicle || entity instanceof ArmorStand) {
|
|
||||||
testNether(event.getEntity());
|
testNether(event.getEntity());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user