Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-01-07 16:57:50 +01:00
Code Issues Projects Releases Wiki Activity

Use specific dependencies in DestinationsProvider.

Browse Source
This commit is contained in:
Jeremy Wood 2023-03-07 18:49:13 -05:00
parent d1f59e3d86
commit 397101f712
No known key found for this signature in database
GPG Key ID: C5BAD04C77B91B4B
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/onarandombox/MultiverseCore/destination/DestinationsProvider.java
View File

@ -10,8 +10,10 @@ import co.aikar.commands.CommandIssuer;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.Destination; import com.onarandombox.MultiverseCore.api.Destination;
import com.onarandombox.MultiverseCore.api.DestinationInstance; import com.onarandombox.MultiverseCore.api.DestinationInstance;
import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
import com.onarandombox.MultiverseCore.api.Teleporter; import com.onarandombox.MultiverseCore.api.Teleporter;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import org.bukkit.Server;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
@ -28,17 +30,17 @@ public class DestinationsProvider {
private static final String SEPARATOR = ":"; private static final String SEPARATOR = ":";
private static final String PERMISSION_PREFIX = "multiverse.teleport."; private static final String PERMISSION_PREFIX = "multiverse.teleport.";
private final MultiverseCore plugin; private final PluginManager pluginManager;
private final SafeTTeleporter safeTTeleporter;
private final Map<String, Destination<?>> destinationMap; private final Map<String, Destination<?>> destinationMap;
/** /**
* Creates a new destinations provider. * Creates a new destinations provider.
*
* @param plugin The plugin.
*/ */
@Inject @Inject
public DestinationsProvider(@NotNull MultiverseCore plugin) { public DestinationsProvider(@NotNull PluginManager pluginManager, @NotNull SafeTTeleporter safeTTeleporter) {
this.plugin = plugin; this.pluginManager = pluginManager;
this.safeTTeleporter = safeTTeleporter;
this.destinationMap = new HashMap<>(); this.destinationMap = new HashMap<>();
} }
@ -53,7 +55,6 @@ public class DestinationsProvider {
} }
private void registerDestinationPerms(@NotNull Destination<?> destination) { private void registerDestinationPerms(@NotNull Destination<?> destination) {
PluginManager pluginManager = this.plugin.getServer().getPluginManager();
pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "self." + destination.getIdentifier())); pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "self." + destination.getIdentifier()));
pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "other." + destination.getIdentifier())); pluginManager.addPermission(new Permission(PERMISSION_PREFIX + "other." + destination.getIdentifier()));
} }
@ -152,7 +153,7 @@ public class DestinationsProvider {
) { ) {
Teleporter teleportHandler = destination.getDestination().getTeleporter(); Teleporter teleportHandler = destination.getDestination().getTeleporter();
if (teleportHandler == null) { if (teleportHandler == null) {
teleportHandler = this.plugin.getSafeTTeleporter(); teleportHandler = safeTTeleporter;
} }
teleportHandler.teleport(teleporter, teleportee, destination); teleportHandler.teleport(teleporter, teleportee, destination);
} }