TASK-4950 PowerCamera is now a Paper only plugin to fix that you can …

…spectate entities while a camera is active
ResilientGroup · Jan 29, 2025 · 6d71e33 · 6d71e33
1 parent 1788457
commit 6d71e33
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<!-- project version -->
-		<revision>0.8.1</revision>
+		<revision>0.9.0</revision>
 		<changelist>-SNAPSHOT</changelist>
 	</properties>
 
@@ -27,8 +27,8 @@
 			<url>https://nexus.reloadkube.managedservices.resilient-teched.com/repository/reload/</url>
 		</repository>
 		<repository>
-			<id>spigotmc-repo</id>
-			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+			<id>papermc</id>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
 		</repository>
 	</repositories>
 
@@ -42,11 +42,16 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot-api</artifactId>
-			<version>1.20.4-R0.1-20240423.152506-123</version>
+			<groupId>io.papermc.paper</groupId>
+			<artifactId>paper-api</artifactId>
+			<version>1.20.4-R0.1-20241030.192207-176</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.papermc</groupId>
+			<artifactId>paperlib</artifactId>
+			<version>1.0.8</version>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/src/main/java/nl/svenar/powercamera/PowerCamera.java b/src/main/java/nl/svenar/powercamera/PowerCamera.java
@@ -1,6 +1,7 @@
 package nl.svenar.powercamera;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import io.papermc.lib.PaperLib;
 import nl.svenar.powercamera.commands.MainCommand;
 import nl.svenar.powercamera.config.ActiveCameraStorage;
 import nl.svenar.powercamera.config.CameraStorage;
@@ -19,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.logging.Level;
 
 @SuppressFBWarnings({"DLS_DEAD_LOCAL_STORE", "MS_MUTABLE_COLLECTION_PKGPROTECT", "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"})
 @SuppressWarnings({"PMD.AtLeastOneConstructor", "PMD.AvoidDuplicateLiterals", "PMD.AvoidReassigningLoopVariables", "PMD.CognitiveComplexity", "PMD.CommentRequired", "PMD.CyclomaticComplexity", "PMD.LocalVariableCouldBeFinal", "PMD.LooseCoupling", "PMD.UnnecessaryImport", "PMD.UseDiamondOperator"})
@@ -49,6 +51,11 @@ public class PowerCamera extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        if (!PaperLib.isPaper()) {
+            PaperLib.suggestPaper(this, Level.SEVERE);
+            getServer().getPluginManager().disablePlugin(this);
+        }
+
         pdf = this.getDescription();
 
         pluginChatPrefix = pluginChatPrefix.replace("%pluginName%", pdf.getName());

diff --git a/src/main/java/nl/svenar/powercamera/events/PlayerMoveHandler.java b/src/main/java/nl/svenar/powercamera/events/PlayerMoveHandler.java
@@ -1,5 +1,6 @@
 package nl.svenar.powercamera.events;
 
+import com.destroystokyo.paper.event.player.PlayerStartSpectatingEntityEvent;
 import nl.svenar.powercamera.PowerCamera;
 import nl.svenar.powercamera.data.CameraMode;
 import nl.svenar.powercamera.data.PlayerCameraData;
@@ -21,9 +22,17 @@ public PlayerMoveHandler(PowerCamera plugin) {
     public void onPlayerMove(PlayerMoveEvent event) {
         PlayerCameraData playerCameraData = plugin.getPlayerData().get(event.getPlayer());
 
-        if (playerCameraData.getCameraMode() == CameraMode.PREVIEW) {
+        if (playerCameraData.getCameraMode() != CameraMode.NONE) {
             event.setCancelled(true);
         }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void onPlayerSpectate(PlayerStartSpectatingEntityEvent event) {
+        PlayerCameraData playerCameraData = plugin.getPlayerData().get(event.getPlayer());
 
+        if (playerCameraData.getCameraMode() != CameraMode.NONE) {
+            event.setCancelled(true);
+        }
     }
 }