Plexus-Mirror/Module-TFMExtras
1
0
Fork 0
mirror of https://github.com/plexusorg/Module-TFMExtras.git synced 2024-12-28 02:24:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from plexusorg/ultimatum-for-jp-ultimate

Browse source 
Removes "ultimate" jumppads mode
This commit is contained in:
Telesphoreo 2024-01-27 09:50:16 -06:00 committed by GitHub
commit 346ba909fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/dev/plex/extras/command/JumpPadsCommand.java
View file

@ -20,7 +20,7 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@CommandParameters(name = "jumppads", usage = "/jumppads <mode> [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 <mode> [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) @CommandPermissions(permission = "plex.tfmextras.jumppads", source = RequiredCommandSource.ANY)
public class JumpPadsCommand extends PlexCommand public class JumpPadsCommand extends PlexCommand
{ {
@ -126,7 +126,7 @@ public class JumpPadsCommand extends PlexCommand
{ {
if (args.length == 1) if (args.length == 1)
{ {
return Arrays.asList("none", "normal", "enhanced", "extreme", "ultimate"); return Arrays.asList("none", "normal", "enhanced", "extreme");
} }
else if (args.length == 2) else if (args.length == 2)
{ {

3
src/main/java/dev/plex/extras/jumppads/Mode.java
View file

@ -4,6 +4,5 @@ public enum Mode
{ {
NORMAL, NORMAL,
ENHANCED, ENHANCED,
EXTREME, EXTREME
ULTIMATE
} }

34
src/main/java/dev/plex/extras/listener/JumpPadsListener.java
View file

@ -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) @EventHandler(priority = EventPriority.HIGHEST)