Fix teleportation past the border with bypass enabled (#63)

pop4959 · Sep 16, 2023 · 5d9c015 · 5d9c015
1 parent 0695bba
commit 5d9c015
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/common/src/main/java/org/popcraft/chunkyborder/ChunkyBorder.java b/common/src/main/java/org/popcraft/chunkyborder/ChunkyBorder.java
@@ -80,6 +80,7 @@ private void subscribeEvents() {
  e.redirect(borderData.map(BorderData::getBorder)
  .filter(border -> !border.isBounding(e.getLocation().getX(), e.getLocation().getZ()))
  .filter(border -> !e.getPlayer().hasPermission("chunkyborder.bypass.move"))
+ .filter(border -> !this.getPlayerData(e.getPlayer().getUUID()).isBypassing())
  .map(border -> {
  final Vector2 center = Vector2.of(borderData.get().getCenterX(), borderData.get().getCenterZ());
  final World world = e.getLocation().getWorld();
@@ -213,8 +214,7 @@ public Map<UUID, PlayerData> getPlayers() {
  }
 
  public PlayerData getPlayerData(final UUID uuid) {
- this.players.computeIfAbsent(uuid, x -> new PlayerData(uuid));
- return players.get(uuid);
+ return this.players.computeIfAbsent(uuid, x -> new PlayerData(uuid));
  }
 
  public Version getVersion() {