Ruakij/LinkedBeaconTeleporters
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed player being removed from ignoreList directly after teleport.

Browse Source
This commit is contained in:
Ruakij 2021-05-10 14:23:53 +02:00
parent 63bab8ae2e
commit b010280111
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/eu/ruekov/ruakij/LinkedBeaconTeleporters/listener/OnCustomPlayerMove.java
View File

@ -6,6 +6,7 @@ import eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent.CustomPlay
import eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent.CustomPlayerMoveEventListener; import eu.ruekov.ruakij.LinkedBeaconTeleporters.customPlayerMoveEvent.CustomPlayerMoveEventListener;
import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporter; import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporter;
import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterBlock; import eu.ruekov.ruakij.LinkedBeaconTeleporters.linkedBeaconTeleporter.LinkedBeaconTeleporterBlock;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -29,10 +30,18 @@ public class OnCustomPlayerMove implements CustomPlayerMoveEventListener {
Player p = e.player(); Player p = e.player();
UUID uuid = p.getUniqueId(); UUID uuid = p.getUniqueId();
// If player found in ignoreList, remove // If player found in ignoreList, check if he stepped out of the Beacon-light
// FIXME: Will remove player from list, even though he should be ignored :/ if(playerBeaconLocation.containsKey(uuid)) {
if(playerBeaconLocation.containsKey(uuid)) LinkedBeaconTeleporterBlock lbtBlock = playerBeaconLocation.get(uuid);
Location lbtBlockLoc = lbtBlock.block().getLocation();
Location pLoc = p.getLocation();
if(lbtBlockLoc.getBlockX() != pLoc.getBlockX() || lbtBlockLoc.getBlockZ() != pLoc.getBlockZ()){
playerBeaconLocation.remove(uuid); playerBeaconLocation.remove(uuid);
}
else
// Player still on beacon, ignore
return;
}
// Check if player is on-top of a beacon // Check if player is on-top of a beacon
Block block = Function.searchForMaterial( Block block = Function.searchForMaterial(