From c5d4997cf4bd96feddd64f24bc787ed1e9a9d298 Mon Sep 17 00:00:00 2001 From: RonanCraft Date: Tue, 8 Mar 2022 11:46:48 -0500 Subject: [PATCH] api, added option to not need a sender (used by magicstick addon) --- .../addons/magicStick/MagicStickEvents.java | 2 +- .../BetterRTPAddons/addons/menus/AddonMenus.java | 4 ++++ .../BetterRTP/player/commands/types/CmdLocation.java | 10 ++-------- .../BetterRTP/references/helpers/HelperRTP.java | 7 +++++++ 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/menus/AddonMenus.java diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/magicStick/MagicStickEvents.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/magicStick/MagicStickEvents.java index e15e64f..059c5a0 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/magicStick/MagicStickEvents.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/magicStick/MagicStickEvents.java @@ -65,7 +65,7 @@ public class MagicStickEvents implements Listener { if (listener.p == e.getPlayer()) return; //Rtp the player - HelperRTP.tp(e.getPlayer(), e.getPlayer(), e.getPlayer().getWorld().getName(), null, RTP_TYPE.ADDON_MAGICSTICK); + HelperRTP.tp(e.getPlayer(), e.getPlayer().getWorld().getName(), null, RTP_TYPE.ADDON_MAGICSTICK); if (this.take) teleportingPlayers.add(new PlayerListener(e.getPlayer())); } diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/menus/AddonMenus.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/menus/AddonMenus.java new file mode 100644 index 0000000..57c13f3 --- /dev/null +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/menus/AddonMenus.java @@ -0,0 +1,4 @@ +package me.SuperRonanCraft.BetterRTPAddons.addons.menus; + +public class AddonMenus { +} diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java index 32dd9bd..d051181 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdLocation.java @@ -29,8 +29,7 @@ public class CmdLocation implements RTPCommand, RTPCommandHelpable { for (String location_name : getLocations().keySet()) { if (location_name.equalsIgnoreCase(args[1].toLowerCase())) { Player p = (Player) sendi; - HelperRTP.tp(p, sendi, null, null, RTP_TYPE.COMMAND, - false, false, (WorldLocations) getLocations().get(location_name)); + HelperRTP.tp(p, sendi, null, null, RTP_TYPE.COMMAND, false, false, (WorldLocations) getLocations().get(location_name)); return; } } @@ -42,8 +41,7 @@ public class CmdLocation implements RTPCommand, RTPCommandHelpable { if (p != null && p.isOnline()) { for (String location_name : getLocations().keySet()) { if (location_name.equalsIgnoreCase(args[1].toLowerCase())) { - HelperRTP.tp(p, sendi, null, null, RTP_TYPE.COMMAND, - false, false, (WorldLocations) getLocations().get(location_name)); + HelperRTP.tp(p, sendi, null, null, RTP_TYPE.COMMAND, false, false, (WorldLocations) getLocations().get(location_name)); return; } } @@ -82,10 +80,6 @@ public class CmdLocation implements RTPCommand, RTPCommandHelpable { return BetterRTP.getInstance().getRTP().worldLocations; } - private Commands getCmd() { - return BetterRTP.getInstance().getCmd(); - } - @Override public String getHelp() { return BetterRTP.getInstance().getText().getHelpLocation(); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/HelperRTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/HelperRTP.java index ca57855..611348f 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/HelperRTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/HelperRTP.java @@ -20,10 +20,17 @@ public class HelperRTP { BetterRTP.getInstance().getText().getNotPlayer(sendi, cmd); } + //Teleporter and sender are the same + public static void tp(Player player, String world, List biomes, RTP_TYPE rtpType) { + tp(player, player, world, biomes, rtpType, false, false); + } + + //Teleported and Sender MAY be different public static void tp(Player player, CommandSender sendi, String world, List biomes, RTP_TYPE rtpType) { tp(player, sendi, world, biomes, rtpType, false, false); } + // public static void tp(Player player, CommandSender sendi, String world, List biomes, RTP_TYPE rtpType, boolean ignoreCooldown, boolean ignoreDelay) { tp(player, sendi, world, biomes, rtpType, ignoreCooldown, ignoreDelay, null);