Skip to content

Fix Folia border task world access #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GenOpenDiesel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Folia border task world access #737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/RegionCheckTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package me.chancesd.pvpmanager.tasks;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.scheduler.BukkitRunnable;

import me.chancesd.pvpmanager.PvPManager;
import me.chancesd.pvpmanager.event.PlayerTagEvent;
import me.chancesd.pvpmanager.event.PlayerUntagEvent;
import me.chancesd.pvpmanager.manager.DependencyManager;
Expand All @@ -21,37 +22,52 @@
public class RegionCheckTask extends BukkitRunnable implements Listener {

private final PlayerManager playerHandler;
private final Map<CombatPlayer, Location> lastLocations = new HashMap<>();
private final Map<CombatPlayer, Location> lastLocations = new ConcurrentHashMap<>();
private final DependencyManager dependencyManager;
private final PvPManager plugin;

public RegionCheckTask(final PlayerManager playerHandler, final DependencyManager dependencyManager) {
this.playerHandler = playerHandler;
this.dependencyManager = dependencyManager;
plugin = playerHandler.getPlugin();
}

@SuppressWarnings("null") // playerLocation can't be null
@Override
public void run() {
for (final CombatPlayer combatPlayer : playerHandler.getPlayersInCombat()) {
final Player player = combatPlayer.getPlayer();
final Location playerLocation = player.getLocation();
if (!dependencyManager.canAttackAt(player, playerLocation)) {
final Location lastLocation = lastLocations.get(combatPlayer);
if (lastLocation == null)
continue;
lastLocation.setPitch(playerLocation.getPitch());
lastLocation.setYaw(playerLocation.getYaw());
combatPlayer.getExemptions().setCanBypassTeleportBlock(true);
ScheduleUtils.teleport(player, lastLocation, "Failed to teleport player out of non-PvP region")
.thenAccept(success -> combatPlayer.getExemptions().setCanBypassTeleportBlock(false));
Log.debug("Tried to teleport " + player.getName() + " out of a safezone");
combatPlayer.message(Lang.PUSHBACK_WARNING);
if (ScheduleUtils.isFolia()) {
player.getScheduler().run(plugin, task -> checkPlayer(combatPlayer), null);
} else {
lastLocations.put(combatPlayer, playerLocation);
checkPlayer(combatPlayer);
}
}
}

@SuppressWarnings("null") // playerLocation can't be null
private void checkPlayer(final CombatPlayer combatPlayer) {
final Player player = combatPlayer.getPlayer();
if (!player.isOnline() || !combatPlayer.isInCombat()) {
lastLocations.remove(combatPlayer);
return;
}
final Location playerLocation = player.getLocation();
if (!dependencyManager.canAttackAt(player, playerLocation)) {
final Location lastLocation = lastLocations.get(combatPlayer);
if (lastLocation == null)
return;
lastLocation.setPitch(playerLocation.getPitch());
lastLocation.setYaw(playerLocation.getYaw());
combatPlayer.getExemptions().setCanBypassTeleportBlock(true);
ScheduleUtils.teleport(player, lastLocation, "Failed to teleport player out of non-PvP region")
.thenAccept(success -> combatPlayer.getExemptions().setCanBypassTeleportBlock(false));
Log.debug("Tried to teleport " + player.getName() + " out of a safezone");
combatPlayer.message(Lang.PUSHBACK_WARNING);
} else {
lastLocations.put(combatPlayer, playerLocation);
}
}

@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerTag(final PlayerTagEvent event) {
lastLocations.put(event.getCombatPlayer(), event.getPlayer().getLocation());
Expand Down