Skip to content

Fixed snitches not firing when pearled into #61

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
xFier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed snitches not firing when pearled into #61

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
9 changes: 5 additions & 4 deletions src/main/java/com/untamedears/JukeAlert/listener/JukeAlertListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ public void enterSnitchProximity(PlayerMoveEvent event) {
}
return;
}
handleSnitchEntry(player);
handleSnitchEntry(player, null);
} catch (NullPointerException npe) {
if (System.currentTimeMillis() - lastNotifyMoveFailure > failureReportDelay) {
JukeAlert.getInstance().getLogger().log(Level.SEVERE, "MoveEvent generated an NPE", npe);
Expand All @@ -500,10 +500,11 @@ public void onVehicleMovement(VehicleMoveEvent event) {
public void onPlayerTeleport(PlayerTeleportEvent event) {

Player player = event.getPlayer();
handleSnitchEntry(player);
handleSnitchEntry(player, null);
handleSnitchEntry(player, event.getTo());
}

private void handleSnitchEntry(Player player) {
private void handleSnitchEntry(Player player, Location overrideLocation) {

if (player.hasMetadata("NPC")) {
return;
Expand All @@ -513,7 +514,7 @@ private void handleSnitchEntry(Player player) {
return;
}
UUID accountId = player.getUniqueId();
Location location = player.getLocation();
Location location = (overrideLocation == null ? player.getLocation() : overrideLocation);
World world = location.getWorld();
Set<Snitch> inList = playersInSnitches.get(accountId);
if (inList == null) {
Expand Down