Skip to content
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

Jump to bottom

feat: Adding permission nodes to bypass teleport timer cancellations #115

Merged
merged 13 commits into from
May 15, 2024
Merged

feat: Adding permission nodes to bypass teleport timer cancellations #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0625efd
feat: Added permission nodes for bypassing movement and rotation on t…
Niestrat99 Jul 24, 2023
3947ca7
fix: return true by default if player is not stored in database for t…
Thatsmusic99 Jul 25, 2023
5528d40
chore: add debugging for command registration
Thatsmusic99 Jul 25, 2023
b22e212
chore: add debugging for payment parsing
Thatsmusic99 Jul 25, 2023
04ad1e0
fix: missing brackets
Thatsmusic99 Jul 25, 2023
cecc8eb
fix: item payments being parsed incorrectly
Thatsmusic99 Jul 25, 2023
de63fb0
fix: check if permission is set
Thatsmusic99 Jul 31, 2023
2d61bf4
fix: warning about slimjar and semi-fix for building
Thatsmusic99 Aug 8, 2023
20eaaf9
chore(version): bump to v6.0.0-rc.3
Thatsmusic99 Aug 9, 2023
725fd43
Merge branch 'v6' into feat/movement-cancel-bypass-permission
Thatsmusic99 Nov 24, 2023
b4f634c
Merge branch 'v6' into feat/movement-cancel-bypass-permission
Thatsmusic99 May 15, 2024
2535b3e
chore: remove old build stuff here too
Thatsmusic99 May 15, 2024
f6af040
chore: clarify movement timer code better
Thatsmusic99 May 15, 2024
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
2 changes: 2 additions & 0 deletions AdvancedTeleport-Bukkit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,8 @@ bukkit {
"at.admin.bypass.distance-limit" to true,
"at.admin.sethome.bypass" to true,
"at.admin.bypass.teleport-on-join" to true,
"at.admin.bypass.movement" to true,
"at.admin.bypass.rotation" to true,
"at.admin.toggletp" to true,
"at.admin.bypass" to true,
"at.admin.tploc" to true,
Expand Down
51 changes: 37 additions & 14 deletions ...-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/MovementManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,11 @@ public class MovementManager implements Listener {

@EventHandler
public void onMovement(PlayerMoveEvent event) {
boolean cancelOnRotate = MainConfig.get().CANCEL_WARM_UP_ON_ROTATION.get();
boolean cancelOnMove = MainConfig.get().CANCEL_WARM_UP_ON_MOVEMENT.get();
if (!cancelOnRotate) {
Location locTo = event.getTo();
Location locFrom = event.getFrom();
if (locTo.getBlockX() == locFrom.getBlockX() // If the player rotated instead of moved
&& locTo.getBlockY() == locFrom.getBlockY()
&& locTo.getBlockZ() == locFrom.getBlockZ()) {
return;
}
}

boolean cancelled = willCancelTimer(event);

UUID uuid = event.getPlayer().getUniqueId();
if ((cancelOnRotate || cancelOnMove) && movement.containsKey(uuid)) {
if (cancelled && movement.containsKey(uuid)) {
ImprovedRunnable timer = movement.get(uuid);
timer.cancel();
CustomMessages.sendMessage(event.getPlayer(), "Teleport.eventMovement");
Expand All @@ -49,6 +41,37 @@ public void onMovement(PlayerMoveEvent event) {
}
}

private static boolean willCancelTimer(PlayerMoveEvent event) {
boolean cancelOnRotate = MainConfig.get().CANCEL_WARM_UP_ON_ROTATION.get() && !event.getPlayer().hasPermission("at.admin.bypass.rotation");
boolean cancelOnMove = MainConfig.get().CANCEL_WARM_UP_ON_MOVEMENT.get() && !event.getPlayer().hasPermission("at.admin.bypass.movement");

boolean cancelled = false;

// If we have to perform position checks, compare blocks
if (cancelOnMove) {
Location locTo = event.getTo();
Location locFrom = event.getFrom();
if (locTo.getBlockX() != locFrom.getBlockX() // If the player moved
|| locTo.getBlockY() != locFrom.getBlockY()
|| locTo.getBlockZ() != locFrom.getBlockZ()) {
cancelled = true;
}
}

// If we have to perform rotation checks, compare
if (cancelOnRotate && !cancelled) {
Location locTo = event.getTo();
Location locFrom = event.getFrom();

if (locTo.getPitch() != locFrom.getPitch()
|| locTo.getYaw() != locFrom.getYaw()) {
cancelled = true;
}
}

return cancelled;
}

public static HashMap<UUID, ImprovedRunnable> getMovement() {
return movement;
}
Expand Down Expand Up @@ -122,8 +145,8 @@ public void run() {
};
movement.put(uuid, movementtimer);
movementtimer.runTaskLater(CoreClass.getInstance(), warmUp * 20L);
if (MainConfig.get().CANCEL_WARM_UP_ON_MOVEMENT.get()
|| MainConfig.get().CANCEL_WARM_UP_ON_ROTATION.get()) {
if ((MainConfig.get().CANCEL_WARM_UP_ON_MOVEMENT.get() && !teleportingPlayer.hasPermission("at.admin.bypass.movement"))
|| (MainConfig.get().CANCEL_WARM_UP_ON_ROTATION.get() && !teleportingPlayer.hasPermission("at.admin.bypass.rotation"))) {
CustomMessages.sendMessage(
teleportingPlayer,
"Teleport.eventBeforeTP",
Expand Down
Loading