Skip to content

Commit 4366518

Browse files
svenar-nlsvenar-nl
committed
Changed player storage to player's UUID storage
1 parent 03e1694 commit 4366518

12 files changed

Lines changed: 22 additions & 23 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public CameraHandler start() {
8585
if (this.plugin.getConfigPlugin().getConfig().getBoolean("camera-effects.invisible"))
8686
player.setInvisible(true);
8787

88-
this.plugin.player_camera_mode.put(this.player, CAMERA_MODE.VIEW);
88+
this.plugin.player_camera_mode.put(this.player.getUniqueId(), CAMERA_MODE.VIEW);
8989
runTaskTimer(this.plugin, 1L, 1L);
9090
player.teleport(camera_path_points.get(0));
9191

@@ -95,7 +95,7 @@ public CameraHandler start() {
9595
}
9696

9797
public CameraHandler stop() {
98-
plugin.player_camera_mode.put(player, CAMERA_MODE.NONE);
98+
plugin.player_camera_mode.put(player.getUniqueId(), CAMERA_MODE.NONE);
9999
try {
100100
this.cancel();
101101
} catch (Exception e) {
@@ -118,7 +118,7 @@ private Vector calculateVelocity(Location start, Location end) {
118118

119119
@Override
120120
public void run() {
121-
if (plugin.player_camera_mode.get(player) == PowerCamera.CAMERA_MODE.VIEW) {
121+
if (plugin.player_camera_mode.get(player.getUniqueId()) == PowerCamera.CAMERA_MODE.VIEW) {
122122
if (this.ticks > camera_path_points.size() - 2) {
123123
this.stop();
124124
return;
@@ -133,14 +133,14 @@ public void run() {
133133

134134
this.ticks += 1;
135135
} else {
136-
if (plugin.player_camera_mode.get(player) == PowerCamera.CAMERA_MODE.NONE)
136+
if (plugin.player_camera_mode.get(player.getUniqueId()) == PowerCamera.CAMERA_MODE.NONE)
137137
return;
138138
player.teleport(previous_player_location);
139139
if (plugin.getConfigPlugin().getConfig().getBoolean("camera-effects.spectator-mode"))
140140
player.setGameMode(previous_gamemode);
141141
if (plugin.getConfigPlugin().getConfig().getBoolean("camera-effects.invisible"))
142142
player.setInvisible(previous_invisible);
143-
plugin.player_camera_mode.put(player, PowerCamera.CAMERA_MODE.NONE);
143+
plugin.player_camera_mode.put(player.getUniqueId(), PowerCamera.CAMERA_MODE.NONE);
144144
player.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Preview ended!");
145145
}
146146

@@ -163,7 +163,7 @@ public CameraHandler preview(Player player, int num, int preview_time) {
163163
Location point = Util.deserializeLocation(camera_points.get(num));
164164
previous_invisible = player.isInvisible();
165165

166-
plugin.player_camera_mode.put(player, PowerCamera.CAMERA_MODE.PREVIEW);
166+
plugin.player_camera_mode.put(player.getUniqueId(), PowerCamera.CAMERA_MODE.PREVIEW);
167167
if (this.plugin.getConfigPlugin().getConfig().getBoolean("camera-effects.spectator-mode"))
168168
player.setGameMode(GameMode.SPECTATOR);
169169
if (this.plugin.getConfigPlugin().getConfig().getBoolean("camera-effects.invisible"))

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.bukkit.Bukkit;
1010
import org.bukkit.ChatColor;
1111
import org.bukkit.command.CommandExecutor;
12-
import org.bukkit.entity.Player;
1312
import org.bukkit.event.Listener;
1413
import org.bukkit.plugin.Plugin;
1514
import org.bukkit.plugin.PluginDescriptionFile;
@@ -33,8 +32,8 @@ public class PowerCamera extends JavaPlugin {
3332
private PluginConfig config_plugin;
3433
private CameraStorage config_cameras;
3534

36-
public HashMap<Player, String> player_selected_camera = new HashMap<Player, String>(); // Selected camera name
37-
public HashMap<Player, CAMERA_MODE> player_camera_mode = new HashMap<Player, CAMERA_MODE>(); // When the player is viewing the camera (/pc start & /pc preview)
35+
public HashMap<UUID, String> player_selected_camera = new HashMap<UUID, String>(); // Selected camera name
36+
public HashMap<UUID, CAMERA_MODE> player_camera_mode = new HashMap<UUID, CAMERA_MODE>(); // When the player is viewing the camera (/pc start & /pc preview)
3837
public HashMap<UUID, CameraHandler> player_camera_handler = new HashMap<UUID, CameraHandler>(); // When the player is viewing the camera (/pc start & /pc preview)
3938
public Instant powercamera_start_time = Instant.now();
4039

‎PowerCamera/src/nl/svenar/powercamera/commands/cmd_addpoint.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public cmd_addpoint(PowerCamera plugin, String command_name) {
1717
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
1818
if (sender.hasPermission("powercamera.cmd.addpoint")) {
1919
if (args.length == 0) {
20-
String camera_name = plugin.player_selected_camera.get((Player) sender);
20+
String camera_name = plugin.player_selected_camera.get(((Player) sender).getUniqueId());
2121
if (camera_name != null) {
2222
plugin.getConfigCameras().camera_addpoint(((Player) sender).getLocation(), camera_name);
2323
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Point added to camera '" + camera_name + "'!");

‎PowerCamera/src/nl/svenar/powercamera/commands/cmd_create.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
2121
if (plugin.getConfigCameras().create_camera(camera_name)) {
2222
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Camera '" + camera_name + "' created!");
2323
// sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Select this camera by doing: /" + commandLabel + " select " + camera_name + "");
24-
plugin.player_selected_camera.put((Player) sender, plugin.getConfigCameras().get_camera_name_ignorecase(camera_name));
24+
plugin.player_selected_camera.put(((Player) sender).getUniqueId(), plugin.getConfigCameras().get_camera_name_ignorecase(camera_name));
2525
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Camera '" + camera_name + "' selected!");
2626
} else {
2727
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.RED + "A camera with the name '" + camera_name + "' already exists!");

‎PowerCamera/src/nl/svenar/powercamera/commands/cmd_delpoint.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
2222
num = Integer.parseInt(args[0]) - 1;
2323
}
2424

25-
String camera_name = plugin.player_selected_camera.get((Player) sender);
25+
String camera_name = plugin.player_selected_camera.get(((Player) sender).getUniqueId());
2626
if (camera_name != null) {
2727
plugin.getConfigCameras().camera_removepoint(camera_name, num);
2828
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Point " + num + " removed from camera '" + camera_name + "'!");

‎PowerCamera/src/nl/svenar/powercamera/commands/cmd_info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public cmd_info(PowerCamera plugin, String command_name) {
2121
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
2222
if (sender.hasPermission("powercamera.cmd.info")) {
2323
if (args.length == 0) {
24-
String camera_name = plugin.player_selected_camera.get((Player) sender);
24+
String camera_name = plugin.player_selected_camera.get(((Player) sender).getUniqueId());
2525
if (camera_name != null) {
2626
List<String> camera_points = plugin.getConfigCameras().getPoints(camera_name);
2727
int camera_duration = plugin.getConfigCameras().getDuration(camera_name);

‎PowerCamera/src/nl/svenar/powercamera/commands/cmd_preview.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public cmd_preview(PowerCamera plugin, String command_name) {
1818
@Override
1919
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
2020
if (sender.hasPermission("powercamera.cmd.preview")) {
21-
if (this.plugin.player_camera_mode.get((Player) sender) == null || this.plugin.player_camera_mode.get((Player) sender) == PowerCamera.CAMERA_MODE.NONE) {
21+
if (this.plugin.player_camera_mode.get(((Player) sender).getUniqueId()) == null || this.plugin.player_camera_mode.get(((Player) sender).getUniqueId()) == PowerCamera.CAMERA_MODE.NONE) {
2222
if (args.length == 1) {
23-
String camera_name = plugin.player_selected_camera.get((Player) sender);
23+
String camera_name = plugin.player_selected_camera.get(((Player) sender).getUniqueId());
2424
if (camera_name != null) {
2525
int preview_time = plugin.getConfigPlugin().getConfig().getInt("point-preview-time");
2626

‎PowerCamera/src/nl/svenar/powercamera/commands/cmd_select.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
1919
if (args.length == 1) {
2020
String camera_name = args[0];
2121
if (plugin.getConfigCameras().camera_exists(camera_name)) {
22-
plugin.player_selected_camera.put((Player) sender, plugin.getConfigCameras().get_camera_name_ignorecase(camera_name));
22+
plugin.player_selected_camera.put(((Player) sender).getUniqueId(), plugin.getConfigCameras().get_camera_name_ignorecase(camera_name));
2323
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Camera '" + camera_name + "' selected!");
2424
} else {
2525
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.RED + "A camera with the name '" + camera_name + "' does not exists!");

‎PowerCamera/src/nl/svenar/powercamera/commands/cmd_setduration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
2121
int duration = Util.timeStringToSecondsConverter(args[0]);
2222

2323
if (duration > 0) {
24-
String camera_name = plugin.player_selected_camera.get((Player) sender);
24+
String camera_name = plugin.player_selected_camera.get(((Player) sender).getUniqueId());
2525
if (camera_name != null) {
2626
plugin.getConfigCameras().setDuration(camera_name, duration);
2727
sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Camera path duration set to: " + duration + " seconds on camera '" + camera_name + "'");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public cmd_start(PowerCamera plugin, String command_name) {
1818
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
1919
if (args.length == 0) {
2020
if (sender.hasPermission("powercamera.cmd.start")) {
21-
if (this.plugin.player_camera_mode.get((Player) sender) == null || this.plugin.player_camera_mode.get((Player) sender) == PowerCamera.CAMERA_MODE.NONE) {
22-
String camera_name = plugin.player_selected_camera.get((Player) sender);
21+
if (this.plugin.player_camera_mode.get(((Player) sender).getUniqueId()) == null || this.plugin.player_camera_mode.get(((Player) sender).getUniqueId()) == PowerCamera.CAMERA_MODE.NONE) {
22+
String camera_name = plugin.player_selected_camera.get(((Player) sender).getUniqueId());
2323
if (camera_name != null) {
2424
this.plugin.player_camera_handler.put(((Player) sender).getUniqueId(), new CameraHandler(plugin, (Player) sender, camera_name).generatePath().start());
2525
} else {
@@ -37,7 +37,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
3737
String camera_name = args[0];
3838

3939
if (sender.hasPermission("powercamera.cmd.start." + camera_name.toLowerCase())) {
40-
if (this.plugin.player_camera_mode.get((Player) sender) == null || this.plugin.player_camera_mode.get((Player) sender) == PowerCamera.CAMERA_MODE.NONE) {
40+
if (this.plugin.player_camera_mode.get(((Player) sender).getUniqueId()) == null || this.plugin.player_camera_mode.get(((Player) sender).getUniqueId()) == PowerCamera.CAMERA_MODE.NONE) {
4141
if (this.plugin.getConfigCameras().camera_exists(camera_name)) {
4242
this.plugin.player_camera_handler.put(((Player) sender).getUniqueId(), new CameraHandler(plugin, (Player) sender, camera_name).generatePath().start());
4343
} else {

0 commit comments

Comments
 (0)