From 8be2a487784b1a54104e1f61940003aab8506517 Mon Sep 17 00:00:00 2001 From: Video Date: Sat, 27 Jan 2024 08:38:46 -0700 Subject: [PATCH] Removes "ultimate" jumppads mode --- .../plex/extras/command/JumpPadsCommand.java | 4 +-- .../java/dev/plex/extras/jumppads/Mode.java | 3 +- .../extras/listener/JumpPadsListener.java | 34 ------------------- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/main/java/dev/plex/extras/command/JumpPadsCommand.java b/src/main/java/dev/plex/extras/command/JumpPadsCommand.java index 348a197..cfaa481 100755 --- a/src/main/java/dev/plex/extras/command/JumpPadsCommand.java +++ b/src/main/java/dev/plex/extras/command/JumpPadsCommand.java @@ -20,7 +20,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@CommandParameters(name = "jumppads", usage = "/jumppads [player]", description = "Enables jump pads for yourself or another player. Mode types available: none, regular, enhanced, extreme, ultimate", aliases = "jp,pads,launchpads") +@CommandParameters(name = "jumppads", usage = "/jumppads [player]", description = "Enables jump pads for yourself or another player. Mode types available: none, regular, enhanced, extreme", aliases = "jp,pads,launchpads") @CommandPermissions(permission = "plex.tfmextras.jumppads", source = RequiredCommandSource.ANY) public class JumpPadsCommand extends PlexCommand { @@ -126,7 +126,7 @@ public class JumpPadsCommand extends PlexCommand { if (args.length == 1) { - return Arrays.asList("none", "normal", "enhanced", "extreme", "ultimate"); + return Arrays.asList("none", "normal", "enhanced", "extreme"); } else if (args.length == 2) { diff --git a/src/main/java/dev/plex/extras/jumppads/Mode.java b/src/main/java/dev/plex/extras/jumppads/Mode.java index df23742..e46569e 100755 --- a/src/main/java/dev/plex/extras/jumppads/Mode.java +++ b/src/main/java/dev/plex/extras/jumppads/Mode.java @@ -4,6 +4,5 @@ public enum Mode { NORMAL, ENHANCED, - EXTREME, - ULTIMATE + EXTREME } diff --git a/src/main/java/dev/plex/extras/listener/JumpPadsListener.java b/src/main/java/dev/plex/extras/listener/JumpPadsListener.java index ca7653b..36ef702 100755 --- a/src/main/java/dev/plex/extras/listener/JumpPadsListener.java +++ b/src/main/java/dev/plex/extras/listener/JumpPadsListener.java @@ -100,40 +100,6 @@ public class JumpPadsListener extends PlexListener } } - - if (mode.equals(Mode.ULTIMATE)) - { - blockWrapMap.forEach((b, w) -> - { - if (jumpPads.wool.getValues().contains(b.getType())) - { - if (w.y() == -1) - { - jumpPads.extreme(playerVector.add(new Vector(0.0, jumpPads.SCALAR * jumpPads.STRENGTH, 0.0))); - } - - switch (w.x()) - { - case (-1): - jumpPads.extreme(playerVector.add(new Vector(-jumpPads.SCALAR * jumpPads.STRENGTH, 0.0, 0.0))); - case (1): - jumpPads.extreme(playerVector.add(new Vector(jumpPads.SCALAR * jumpPads.STRENGTH, 0.0, 0.0))); - } - - switch (w.z()) - { - case (-1): - jumpPads.extreme(playerVector.add(new Vector(0.0, 0.0, -jumpPads.SCALAR * jumpPads.STRENGTH))); - case (1): - jumpPads.extreme(playerVector.add(new Vector(0.0, 0.0, jumpPads.SCALAR * jumpPads.STRENGTH))); - - } - - player.setVelocity(playerVector); - } - }); - - } } @EventHandler(priority = EventPriority.HIGHEST)