Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<!-- project version -->
<revision>0.8.1</revision>
<revision>0.9.0</revision>
<changelist>-SNAPSHOT</changelist>
</properties>

Expand All @@ -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>

Expand All @@ -42,9 +42,9 @@

<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>
</dependencies>
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/nl/svenar/powercamera/PowerCamera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,23 @@ public class PowerCamera extends JavaPlugin {

private MainCommand mainCommand;

private static boolean hasClass(final String className) {
try {
Class.forName(className);
return true;
} catch (ClassNotFoundException e) {
return false;
}
}

@Override
public void onEnable() {
if (!(hasClass("com.destroystokyo.paper.PaperConfig") || hasClass("io.papermc.paper.configuration.Configuration"))) {
getLogger().severe("This plugin requires Paper to run. Please install Paper and restart your server.");
getServer().getPluginManager().disablePlugin(this);
Wolf2323 marked this conversation as resolved.
Show resolved Hide resolved
return;
}

pdf = this.getDescription();

pluginChatPrefix = pluginChatPrefix.replace("%pluginName%", pdf.getName());
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/nl/svenar/powercamera/events/PlayerMoveHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}
}
}