Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-24 03:35:11 +01:00
Code Issues Projects Releases Wiki Activity

Adds new perm for bypassing delayed commands.

Browse Source 
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1136
This commit is contained in:
tastybento 2020-02-07 18:42:39 -08:00
parent 332967950f
commit 05a4b2d2c7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommand.java
View File

@ -74,7 +74,8 @@ public abstract class DelayedTeleportCommand extends CompositeCommand implements
* @param confirmed Runnable to be executed if successfully delayed. * @param confirmed Runnable to be executed if successfully delayed.
*/ */
public void delayCommand(User user, String message, Runnable confirmed) { public void delayCommand(User user, String message, Runnable confirmed) {
if (getSettings().getDelayTime() < 1 || user.isOp() || user.hasPermission(getPermissionPrefix() + "mod.bypasscooldowns")) { if (getSettings().getDelayTime() < 1 || user.isOp() || user.hasPermission(getPermissionPrefix() + "mod.bypasscooldowns")
|| user.hasPermission(getPermissionPrefix() + "mod.bypassdelays")) {
Bukkit.getScheduler().runTask(getPlugin(), confirmed); Bukkit.getScheduler().runTask(getPlugin(), confirmed);
return; return;
} }

14
src/test/java/world/bentobox/bentobox/api/commands/DelayedTeleportCommandTest.java
View File

@ -220,8 +220,18 @@ public class DelayedTeleportCommandTest {
* Test method for {@link world.bentobox.bentobox.api.commands.DelayedTeleportCommand#delayCommand(world.bentobox.bentobox.api.user.User, java.lang.String, java.lang.Runnable)}. * Test method for {@link world.bentobox.bentobox.api.commands.DelayedTeleportCommand#delayCommand(world.bentobox.bentobox.api.user.User, java.lang.String, java.lang.Runnable)}.
*/ */
@Test @Test
public void testDelayCommandUserStringRunnablePerm() { public void testDelayCommandUserStringRunnablePermBypassCooldowns() {
when(user.hasPermission(anyString())).thenReturn(true); when(user.hasPermission(eq("nullmod.bypasscooldowns"))).thenReturn(true);
dtc.delayCommand(user, HELLO, command);
verify(sch).runTask(eq(plugin), eq(command));
}
/**
* Test method for {@link world.bentobox.bentobox.api.commands.DelayedTeleportCommand#delayCommand(world.bentobox.bentobox.api.user.User, java.lang.String, java.lang.Runnable)}.
*/
@Test
public void testDelayCommandUserStringRunnablePermBypassDelay() {
when(user.hasPermission(eq("nullmod.bypassdelays"))).thenReturn(true);
dtc.delayCommand(user, HELLO, command); dtc.delayCommand(user, HELLO, command);
verify(sch).runTask(eq(plugin), eq(command)); verify(sch).runTask(eq(plugin), eq(command));
} }