mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-08-25 07:15:35 +02:00
Compare commits
1 Commits
fix/v7/unn
...
renovate/w
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8012aa9399 |
@@ -600,7 +600,7 @@ public class PlayerEventListener implements Listener {
|
||||
PlotArea area = location.getPlotArea();
|
||||
if (area == null) {
|
||||
if (lastPlot != null) {
|
||||
plotListener.plotExit(pp, lastPlot, null, null);
|
||||
plotListener.plotExit(pp, lastPlot);
|
||||
lastPlotAccess.remove();
|
||||
}
|
||||
try (final MetaDataAccess<Location> lastLocationAccess =
|
||||
@@ -753,7 +753,7 @@ public class PlayerEventListener implements Listener {
|
||||
if (now == null) {
|
||||
try (final MetaDataAccess<Boolean> kickAccess =
|
||||
pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
|
||||
if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, now, area) && this.tmpTeleport && !kickAccess.get().orElse(
|
||||
if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
|
||||
false)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
@@ -847,7 +847,7 @@ public class PlayerEventListener implements Listener {
|
||||
if (plot == null) {
|
||||
try (final MetaDataAccess<Boolean> kickAccess =
|
||||
pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
|
||||
if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, null, area) && this.tmpTeleport && !kickAccess.get().orElse(
|
||||
if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
|
||||
false)) {
|
||||
pp.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission_event"),
|
||||
|
@@ -164,7 +164,7 @@ public class PlotListener {
|
||||
try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
|
||||
Plot last = lastPlot.get().orElse(null);
|
||||
if ((last != null) && !last.getId().equals(plot.getId())) {
|
||||
plotExit(player, last, plot, plot.getArea());
|
||||
plotExit(player, last);
|
||||
}
|
||||
if (PlotSquared.platform().expireManager() != null) {
|
||||
PlotSquared.platform().expireManager().handleEntry(player, plot);
|
||||
@@ -365,12 +365,7 @@ public class PlotListener {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean plotExit(
|
||||
final PlotPlayer<?> player,
|
||||
@NonNull Plot plot,
|
||||
@Nullable Plot nextPlot,
|
||||
@Nullable PlotArea nextArea
|
||||
) {
|
||||
public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
|
||||
try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
|
||||
final Plot previous = lastPlot.remove();
|
||||
|
||||
@@ -387,10 +382,8 @@ public class PlotListener {
|
||||
if (plot.hasOwner()) {
|
||||
PlotArea pw = plot.getArea();
|
||||
if (pw == null) {
|
||||
if (nextPlot == null || (pw = nextPlot.getArea()) == null) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
try (final MetaDataAccess<Boolean> kickAccess =
|
||||
player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
|
||||
if (plot.getFlag(DenyExitFlag.class) && !player.hasPermission(Permission.PERMISSION_ADMIN_EXIT_DENIED) &&
|
||||
@@ -447,17 +440,6 @@ public class PlotListener {
|
||||
player.setFlight(value.get());
|
||||
metaDataAccess.remove();
|
||||
} else {
|
||||
FlyFlag.FlyStatus flight = FlyFlag.FlyStatus.DEFAULT;
|
||||
if (nextPlot != null) {
|
||||
flight = nextPlot.getFlag(FlyFlag.class);
|
||||
} else if (nextArea != null) {
|
||||
if (nextArea.isRoadFlags()) {
|
||||
flight = nextArea.getRoadFlag(FlyFlag.class);
|
||||
} else {
|
||||
flight = nextArea.getFlag(FlyFlag.class);
|
||||
}
|
||||
}
|
||||
if (flight != FlyFlag.FlyStatus.ENABLED) {
|
||||
GameMode gameMode = player.getGameMode();
|
||||
if (gameMode == GameModes.SURVIVAL || gameMode == GameModes.ADVENTURE) {
|
||||
player.setFlight(false);
|
||||
@@ -467,7 +449,6 @@ public class PlotListener {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (plot.getFlag(TimeFlag.class) != TimeFlag.TIME_DISABLED.getValue().longValue()) {
|
||||
player.setTime(Long.MAX_VALUE);
|
||||
|
@@ -1340,7 +1340,7 @@ public class Plot {
|
||||
for (Plot current : getConnectedPlots()) {
|
||||
List<PlotPlayer<?>> players = current.getPlayersInPlot();
|
||||
for (PlotPlayer<?> pp : players) {
|
||||
this.plotListener.plotExit(pp, current, null, area);
|
||||
this.plotListener.plotExit(pp, current);
|
||||
}
|
||||
|
||||
if (Settings.Backup.DELETE_ON_UNCLAIM) {
|
||||
@@ -2594,7 +2594,7 @@ public class Plot {
|
||||
public void reEnter() {
|
||||
TaskManager.runTaskLater(() -> {
|
||||
for (PlotPlayer<?> pp : Plot.this.getPlayersInPlot()) {
|
||||
this.plotListener.plotExit(pp, Plot.this, Plot.this, area);
|
||||
this.plotListener.plotExit(pp, Plot.this);
|
||||
this.plotListener.plotEntry(pp, Plot.this);
|
||||
}
|
||||
}, TaskTime.ticks(1L));
|
||||
|
@@ -12,7 +12,7 @@ adventure-bukkit = "4.4.1"
|
||||
log4j = "2.19.0"
|
||||
|
||||
# Plugins
|
||||
worldedit = "7.2.20"
|
||||
worldedit = "7.3.16"
|
||||
fawe = "2.13.1"
|
||||
placeholderapi = "2.11.6"
|
||||
luckperms = "5.5"
|
||||
|
Reference in New Issue
Block a user