Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-28 03:09:14 +00:00
Code Issues Releases Activity

fix: Citizens is a stupid plugin and calls move events for NPCs

Browse Source
This commit is contained in:
SamB440
2022-05-20 17:17:51 +01:00
parent b7fd8da862
commit ab8ef5a78b
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rpgregions/src/main/java/net/islandearth/rpgregions/listener/MoveListener.java
View File

@@ -2,6 +2,7 @@ package net.islandearth.rpgregions.listener;
import net.islandearth.rpgregions.RPGRegions;
import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -13,19 +14,35 @@ public record MoveListener(RPGRegions plugin) implements Listener {
@EventHandler
public void onMove(PlayerMoveEvent event) {
final Player player = event.getPlayer();
plugin.getManagers().getIntegrationManager().handleMove(event);
if (!plugin.getManagers().getIntegrationManager().isInRegion(event.getTo()) && plugin.getManagers().getIntegrationManager().isInRegion(event.getFrom())) {
for (ConfiguredRegion configuredRegion : plugin.getManagers().getRegionsCache().getConfiguredRegions().values()) {
configuredRegion.getEffects().forEach(effect -> effect.uneffect(player));
}
}
plugin.debug(String.format("Entrypoint move for player '%s'.", player.getName()));
this.move(event);
}
@EventHandler
public void onTeleport(PlayerTeleportEvent event) {
final Player player = event.getPlayer();
plugin.debug(String.format("Entrypoint teleport for player '%s'.", player.getName()));
this.move(event);
}
private void move(PlayerMoveEvent event) {
final Player player = event.getPlayer();
// RANT!
// Citizens is STUPID AS HELL and is activating PlayerTeleportEvent for NPCs.
// This causes issues with my plugin because that player doesn't exist for me and
// it can result in regions with requirement preventing NPCs from entering!!!
// So now I have to do this STUPID check to see if the player actually exists!?!?!
// IT'S AN NPC!!!!
// /RANT
final boolean isNpcPlayer = Bukkit.getPlayer(player.getUniqueId()) == null;
if (isNpcPlayer) {
plugin.debug("A stupid plugin tried to call move event for an NPC. Ignoring.");
return;
}
plugin.getManagers().getIntegrationManager().handleMove(event);
if (!plugin.getManagers().getIntegrationManager().isInRegion(event.getTo()) && plugin.getManagers().getIntegrationManager().isInRegion(event.getFrom())) {
for (ConfiguredRegion configuredRegion : plugin.getManagers().getRegionsCache().getConfiguredRegions().values()) {
configuredRegion.getEffects().forEach(effect -> effect.uneffect(player));