Citizens Integration #17
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package edu.whimc.portals.commands.portal; | ||
|
|
||
| import edu.whimc.portals.Main; | ||
| import edu.whimc.portals.Portal; | ||
| import edu.whimc.portals.commands.AbstractSubCommand; | ||
| import edu.whimc.portals.utils.Messenger; | ||
| import org.bukkit.command.CommandSender; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.Material; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * The command to allow Citizens NPCs to use a portal. | ||
| * Command: "/portal allowcitizens" | ||
| */ | ||
| public class PortalAllowCitizens extends AbstractSubCommand { | ||
| /** | ||
| * Constructs a PortalAllowCitizens command with the given arguments. | ||
| * | ||
| * @param plugin the instance of the plugin. | ||
| * @param baseCommand the base command keyword. | ||
| * @param subCommand the sub command keyword. | ||
| */ | ||
| public PortalAllowCitizens(Main plugin, String baseCommand, String subCommand) { | ||
| super(plugin, baseCommand, subCommand); | ||
| super.description("Toggles Citizens NPCs' ability to travel through the portal."); | ||
| super.arguments("portal"); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean onCommand(CommandSender sender, String[] args) { | ||
|
|
||
| // notify if Citizens plugin is not loaded and abort command execution | ||
| if(!plugin.getPluginStatus()) { | ||
| Messenger.msg(sender, "Citizens plugin is not loaded"); | ||
| return true; | ||
| } | ||
|
|
||
| // notify if portal does not exist and abort command execution | ||
| Portal portal = Portal.getPortal(args[0]); | ||
| if (portal == null) { | ||
| Messenger.msg(sender, Messenger.ReplaceMessage.PORTAL_DOES_NOT_EXIST, args[0]); | ||
| return true; | ||
| } | ||
|
|
||
| // notify if portal is invalid, suggest deletion, and abort command execution | ||
| if (!portal.isValid()) { | ||
| Messenger.msg(sender, Messenger.ReplaceMessage.PORTAL_INVALID, portal.getName()); | ||
| Messenger.msg(sender, Messenger.ReplaceMessage.SUGGEST_DELETE, "/portal remove " + portal.getName()); | ||
| return true; | ||
| } | ||
|
|
||
|
Member
There was a problem hiding this comment. If the portal's filler is water or lava I'd send a message to the user telling them about the consequences as noted in the README. I'd do the same thing in the setfiller sub-command if the portal allows citizens and the new fill type is water/lava. |
||
| portal.setAllowCitizens(!portal.getAllowCitizens()); | ||
| Messenger.msg(sender, portal.getName() + " allows citizens: " + portal.getAllowCitizens()); | ||
|
|
||
| // Notify consequences of water/lava filler | ||
| if (portal.getFiller() == Material.WATER) { | ||
| Messenger.msg(sender, Messenger.ReplaceMessage.WATER_FILLER); | ||
| } | ||
| if (portal.getFiller() == Material.LAVA) { | ||
| Messenger.msg(sender, Messenger.ReplaceMessage.LAVA_FILLER); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| @Override | ||
| protected List<String> onTabComplete(CommandSender sender, String[] args) { | ||
| return Portal.getTabCompletedPortals(args[0]); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If Citizens isn't loaded you should send a message to the user and return early.