Skip to content

Commit

Permalink
Fix for Citizen NPC
Browse files Browse the repository at this point in the history
  • Loading branch information
arboriginal committed Feb 24, 2019
1 parent c5d9775 commit 0ad14b2
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
30 changes: 16 additions & 14 deletions src/me/arboriginal/SimpleCompass/plugin/Listeners.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.HashMap;
import java.util.UUID;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
Expand Down Expand Up @@ -42,24 +43,20 @@ public Listeners(SimpleCompass plugin) {

@EventHandler
public void onEntityPickupItem(EntityPickupItemEvent event) {
if (event.isCancelled() || !(event.getEntity() instanceof Player)) return;

if (event.isCancelled() || !isPlayer(event.getEntity())) return;
sc.tasks.set(TasksTypes.REFRESH_STATUS, (Player) event.getEntity(), sc.config.getInt("delays.pickup_refresh"));
}

@EventHandler
public void onEntityToggleGlide(EntityToggleGlideEvent event) {
if (event.isCancelled() || !(event.getEntity() instanceof Player)) return;

if (event.isCancelled() || !isPlayer(event.getEntity())) return;
sc.tasks.set(TasksTypes.REFRESH_STATUS, (Player) event.getEntity());
}

@EventHandler
public void onInventoryClose(InventoryCloseEvent event) {
InventoryHolder holder = event.getInventory().getHolder();

if (!(holder instanceof Player)) return;

if (!(holder instanceof Player) || !isPlayer((Player) holder)) return;
sc.tasks.set(TasksTypes.REFRESH_STATUS, (Player) holder);
}

Expand All @@ -79,14 +76,13 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {

@EventHandler
public void onPlayerCommandSend(PlayerCommandSendEvent event) {
if (!(event.getPlayer() instanceof Player)) return;

if (!isPlayer(event.getPlayer())) return;
sc.tasks.set(TasksTypes.REFRESH_STATUS, event.getPlayer());
}

@EventHandler
public void onPlayerDeath(PlayerDeathEvent event) {
if (!(event.getEntity() instanceof Player)) return;
if (!isPlayer(event.getEntity())) return;
sc.compasses.removeCompass((Player) event.getEntity());
}

Expand Down Expand Up @@ -134,15 +130,13 @@ public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {

@EventHandler
public void onVehicleEnter(VehicleEnterEvent event) {
if (event.isCancelled() || !(event.getEntered() instanceof Player)) return;

if (event.isCancelled() || !isPlayer(event.getEntered())) return;
sc.tasks.set(TasksTypes.REFRESH_STATUS, (Player) event.getEntered());
}

@EventHandler
public void onVehicleExit(VehicleExitEvent event) {
if (event.isCancelled() || !(event.getExited() instanceof Player)) return;

if (event.isCancelled() || !isPlayer(event.getExited())) return;
sc.tasks.set(TasksTypes.REFRESH_STATUS, (Player) event.getExited());
}

Expand All @@ -152,4 +146,12 @@ public void onServerCommand(ServerCommandEvent event) {

sc.compasses.commandTrigger(event.getCommand());
}

// -----------------------------------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------------------------------

private boolean isPlayer(Entity entity) {
return (entity instanceof Player) && !entity.hasMetadata("NPC");
}
}
2 changes: 1 addition & 1 deletion src/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: SimpleCompass
description: Simple compass to help player who don't have sense of direction.
version: 0.9.9
version: 1.0

author: arboriginal
website: https://www.spigotmc.org/resources/simplecompass.63140/
Expand Down

0 comments on commit 0ad14b2

Please sign in to comment.