EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
NotMyFault 2022-02-13 10:47:05 +01:00 committed by Alex
parent 2f5e6665f7
commit 5226a0f4bc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
View File

@ -198,20 +198,20 @@ public class EntitySpawnListener implements Listener {
final Location fromLocLocation = BukkitUtil.adapt(fromLocation.getLocation()); final Location fromLocLocation = BukkitUtil.adapt(fromLocation.getLocation());
final PlotArea fromArea = fromLocLocation.getPlotArea(); final PlotArea fromArea = fromLocLocation.getPlotArea();
Location toLocLocation = BukkitUtil.adapt(toLocation.getLocation()); Location toLocLocation = BukkitUtil.adapt(toLocation.getLocation());
PlotArea area = toLocLocation.getPlotArea(); PlotArea toArea = toLocLocation.getPlotArea();
if (area == null) { if (toArea == null) {
if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) { if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
event.setCancelled(true); event.setCancelled(true);
} }
return; return;
} }
Plot plot = area.getOwnedPlot(toLocLocation); Plot toPlot = toArea.getOwnedPlot(toLocLocation);
if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) { if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
final Plot fromPlot = fromArea.getOwnedPlot(fromLocLocation); final Plot fromPlot = fromArea.getOwnedPlot(fromLocLocation);
if (fromPlot != null || plot != null) { if (fromPlot != null || toPlot != null) {
if ((fromPlot == null || !fromPlot.equals(plot)) && (plot == null || !plot.equals(fromPlot))) { if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }