diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java index 750cb667..66899f54 100644 --- a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java +++ b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java @@ -23,7 +23,7 @@ public class AdvancedPortalsPlugin extends JavaPlugin { // Failed to submit the stats :-( } - this.getServer().getConsoleSender().sendMessage("\u00A7aAdvanced portals have been sucsessfully enabled!"); + this.getServer().getConsoleSender().sendMessage("\u00A7aAdvanced portals have been successfully enabled!"); String packageName = getServer().getClass().getPackage().getName(); String[] packageSplit = packageName.split("\\."); @@ -46,10 +46,6 @@ public class AdvancedPortalsPlugin extends JavaPlugin { e.printStackTrace(); } - if(getServer().getPluginManager().getPlugin("NoCheatPlus") != null){ - Listeners.noCheatsPlus = true; - } - new Assets(this); // Opens a channel that messages bungeeCord diff --git a/src/com/sekwah/advancedportals/DestinationCommand.java b/src/com/sekwah/advancedportals/DestinationCommand.java index fd06bf94..5235777d 100644 --- a/src/com/sekwah/advancedportals/DestinationCommand.java +++ b/src/com/sekwah/advancedportals/DestinationCommand.java @@ -14,7 +14,7 @@ import java.util.List; public class DestinationCommand implements CommandExecutor, TabCompleter { - private final int PortalMessagesDisplay; + public static int PortalMessagesDisplay = 0; private AdvancedPortalsPlugin plugin; @@ -95,7 +95,7 @@ public class DestinationCommand implements CommandExecutor, TabCompleter { } } else{ - sender.sendMessage("\u00A7c[\u00A77AdvancedPortals\u00A7c] You need to state the name of the destination you wish to teleport to."); + sender.sendMessage("\u00A7c[\u00A77AdvancedPortals\u00A7c] You need to state the name of the destination you wish to exemptPlayer to."); } } else if(args[0].toLowerCase().equals("list")) { diff --git a/src/com/sekwah/advancedportals/Listeners.java b/src/com/sekwah/advancedportals/Listeners.java index d0c356e7..75255db3 100644 --- a/src/com/sekwah/advancedportals/Listeners.java +++ b/src/com/sekwah/advancedportals/Listeners.java @@ -1,6 +1,5 @@ package com.sekwah.advancedportals; -import com.sekwah.advancedportals.compat.NoCheatPlus; import com.sekwah.advancedportals.events.WarpEvent; import com.sekwah.advancedportals.portals.AdvancedPortal; import com.sekwah.advancedportals.portals.Portal; @@ -22,7 +21,6 @@ import org.bukkit.metadata.FixedMetadataValue; public class Listeners implements Listener { - public static boolean noCheatsPlus = false; private final AdvancedPortalsPlugin plugin; private int PortalMessagesDisplay = 2; @@ -91,7 +89,7 @@ public class Listeners implements Listener { eyeloc.setY(eyeloc.getY() + player.getEyeHeight()); AdvancedPortal[] portals = Portal.Portals; for(AdvancedPortal portal : portals){ - if(portal.worldName.equals(loc.getWorld().getName())){ + if(loc.getWorld() != null && portal.worldName.equals(loc.getWorld().getName())){ if(portal.trigger.equals(loc.getBlock().getType()) || portal.trigger.equals(eyeloc.getBlock().getType())){ if((portal.pos1.getX() + 1D) >= loc.getX() && (portal.pos1.getY() + 1D) >= loc.getY() && (portal.pos1.getZ() + 1D) >= loc.getZ()){ @@ -99,8 +97,8 @@ public class Listeners implements Listener { WarpEvent warpEvent = new WarpEvent(player, portal.portalName); - plugin.getServer().getPluginManager().callEvent(event); - + plugin.getServer().getPluginManager().callEvent(warpEvent); + if (!event.isCancelled()) { boolean warped = Portal.activate(player, portal.portalName); if(PortalMessagesDisplay == 1 && warped){ @@ -117,9 +115,9 @@ public class Listeners implements Listener { } if(warped){ - if(noCheatsPlus){ - NoCheatPlus.teleport(player); - } + //event.setFrom(player.getLocation()); + //event.setTo(player.getLocation()); + //event.setCancelled(true); } else{ diff --git a/src/com/sekwah/advancedportals/Selection.java b/src/com/sekwah/advancedportals/Selection.java index 2a255b13..32ad579c 100644 --- a/src/com/sekwah/advancedportals/Selection.java +++ b/src/com/sekwah/advancedportals/Selection.java @@ -7,7 +7,7 @@ import org.bukkit.entity.Player; public class Selection { - public static Material blockType = Material.WOOL; + public static Material blockType = Material.STAINED_GLASS; public static int timeout = 10; public static byte metadata = 14; diff --git a/src/com/sekwah/advancedportals/WarpCommand.java b/src/com/sekwah/advancedportals/WarpCommand.java index 8aac4ae8..954468a6 100644 --- a/src/com/sekwah/advancedportals/WarpCommand.java +++ b/src/com/sekwah/advancedportals/WarpCommand.java @@ -5,6 +5,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; +import org.bukkit.entity.Player; import java.util.LinkedList; import java.util.List; @@ -25,9 +26,17 @@ public class WarpCommand implements CommandExecutor, TabCompleter { public boolean onCommand(CommandSender sender, Command cmd, String command, String[] args) { if(args.length > 0){ if(Destination.warp(sender, args[0], false)){ - sender.sendMessage(""); - sender.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] You have been warped to \u00A7e" + args[0] + "\u00A7a."); - sender.sendMessage(""); + if(DestinationCommand.PortalMessagesDisplay == 1){ + sender.sendMessage(""); + sender.sendMessage("\u00A7a[\u00A7eAdvancedPortals\u00A7a] You have been warped to \u00A7e" + args[0].replaceAll("_", " ") + "\u00A7a."); + sender.sendMessage(""); + } + else if(DestinationCommand.PortalMessagesDisplay == 2){ + ConfigAccessor config = new ConfigAccessor(plugin, "Destinations.yml"); + plugin.nmsAccess.sendActionBarMessage("{text:\"\u00A7aYou have warped to \u00A7e" + args[0].replaceAll("_", " ") + "\u00A7a.\"}", (Player) sender); + /**plugin.nmsAccess.sendActionBarMessage("[{text:\"You have warped to \",color:green},{text:\"" + config.getConfig().getString(Portal.Portals[portalId].portalName + ".destination").replaceAll("_", " ") + + "\",color:yellow},{\"text\":\".\",color:green}]", player);*/ + } } else{ sender.sendMessage(""); diff --git a/src/com/sekwah/advancedportals/compat/NoCheatPlus.java b/src/com/sekwah/advancedportals/compat/NoCheatPlus.java deleted file mode 100644 index 72fd8896..00000000 --- a/src/com/sekwah/advancedportals/compat/NoCheatPlus.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.sekwah.advancedportals.compat; - -import fr.neatmonster.nocheatplus.checks.moving.MovingData; -import org.bukkit.entity.Player; - -public class NoCheatPlus { - - public static void teleport(Player player) { - MovingData.getData(player).setTeleported(player.getLocation()); - // MovingData.getData(player).prepareSetBack(player.getLocation()); - //MovingData.getData(player).onSetBack(player.getLocation()); - System.out.println("Warp NoCheat"); - } -} diff --git a/src/com/sekwah/advancedportals/portals/Portal.java b/src/com/sekwah/advancedportals/portals/Portal.java index 9c51ba36..dbe6e41e 100644 --- a/src/com/sekwah/advancedportals/portals/Portal.java +++ b/src/com/sekwah/advancedportals/portals/Portal.java @@ -369,7 +369,7 @@ public class Portal { } } - // add code for if the portal doesnt have a destination but a teleport location + // add code for if the portal doesnt have a destination but a exemptPlayer location }