Added command '/pc stop' and permission 'powercamera.cmd.stop'

Author: svenar-nl

PowerCamera/plugin.yml

@@ -30,6 +30,8 @@ permissions:
         default: op
     powercamera.cmd.start:
         default: op
+    powercamera.cmd.stop:
+        default: op
     powercamera.cmd.stats:
         default: op
     powercamera.hidestartmessages:

PowerCamera/src/nl/svenar/powercamera/CameraHandler.java

@@ -75,7 +75,7 @@ private double calculateProgress(double start, double end, int progress, int pro
 		return start + ((double) progress / (double) progress_max) * (end - start);
 	}
 
-	public void start() {
+	public CameraHandler start() {
 		this.previous_gamemode = this.player.getGameMode();
 		this.previous_player_location = this.player.getLocation();
 		this.previous_invisible = Util.isPlayerInvisible(this.player);
@@ -88,9 +88,10 @@ public void start() {
 		player.teleport(camera_path_points.get(0));
 
 		if (!this.player.hasPermission("powercamera.hidestartmessages") && !this.player.hasPermission("powercamera.hideallmessages")) this.player.sendMessage(this.plugin.getPluginChatPrefix() + ChatColor.GREEN + "Viewing the path of camera '" + this.camera_name + "'!");
+		return this;
 	}
 
-	public void stop() {
+	public CameraHandler stop() {
 		plugin.player_camera_mode.put(player, CAMERA_MODE.NONE);
 		this.cancel();
 
@@ -99,6 +100,7 @@ public void stop() {
 		if (this.plugin.getConfigPlugin().getConfig().getBoolean("camera-effects.invisible")) player.setInvisible(previous_invisible);
 
 		if (!this.player.hasPermission("powercamera.hidestartmessages") && !this.player.hasPermission("powercamera.hideallmessages")) player.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "The path of camera '" + camera_name + "' has ended!");
+		return this;
 	}
 
 	private Vector calculateVelocity(Location start, Location end) {

PowerCamera/src/nl/svenar/powercamera/PowerCamera.java

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -34,6 +35,7 @@ public class PowerCamera extends JavaPlugin {
 
 	public HashMap<Player, String> player_selected_camera = new HashMap<Player, String>(); // Selected camera name
 	public HashMap<Player, CAMERA_MODE> player_camera_mode = new HashMap<Player, CAMERA_MODE>(); // When the player is viewing the camera (/pc start & /pc preview)
+	public HashMap<UUID, CameraHandler> player_camera_handler = new HashMap<UUID, CameraHandler>(); // When the player is viewing the camera (/pc start & /pc preview)
 	public Instant powercamera_start_time = Instant.now();
 
 	public static enum CAMERA_MODE {

PowerCamera/src/nl/svenar/powercamera/commands/MainCommand.java

@@ -32,6 +32,7 @@ public MainCommand(PowerCamera plugin) {
 		new cmd_info(plugin, "info");
 		new cmd_setduration(plugin, "setduration");
 		new cmd_start(plugin, "start");
+		new cmd_stop(plugin, "stop");
 		new cmd_stats(plugin, "stats");
 	}
 

PowerCamera/src/nl/svenar/powercamera/commands/cmd_start.java

@@ -21,7 +21,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
 				if (this.plugin.player_camera_mode.get((Player) sender) == null || this.plugin.player_camera_mode.get((Player) sender) == PowerCamera.CAMERA_MODE.NONE) {
 					String camera_name = plugin.player_selected_camera.get((Player) sender);
 					if (camera_name != null) {
-						new CameraHandler(plugin, (Player) sender, camera_name).generatePath().start();
+						this.plugin.player_camera_handler.put(((Player) sender).getUniqueId(), new CameraHandler(plugin, (Player) sender, camera_name).generatePath().start());
 					} else {
 						sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.RED + "No camera selected!");
 						sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Select a camera by doing: /" + commandLabel + " select <name>");

PowerCamera/src/nl/svenar/powercamera/commands/cmd_stop.java

@@ -0,0 +1,33 @@
+package nl.svenar.powercamera.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import nl.svenar.powercamera.PowerCamera;
+
+public class cmd_stop extends PowerCameraCommand {
+
+	public cmd_stop(PowerCamera plugin, String command_name) {
+		super(plugin, command_name, COMMAND_EXECUTOR.PLAYER);
+	}
+
+	@Override
+	public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
+		if (sender instanceof Player) {
+			if (sender.hasPermission("powercamera.cmd.stop")) {
+				if (this.plugin.player_camera_mode.get((Player) sender) != null && this.plugin.player_camera_mode.get((Player) sender) != PowerCamera.CAMERA_MODE.NONE && this.plugin.player_camera_handler.get(((Player) sender).getUniqueId()) != null) {
+					this.plugin.player_camera_handler.get(((Player) sender).getUniqueId()).stop();
+					sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Current camera stopped");
+				} else {
+					sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.RED + "No camera active!");
+				}
+			} else {
+				sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.DARK_RED + "You do not have permission to execute this command");
+			}
+		}
+
+		return false;
+	}
+}