-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added vanilla (and more generally non-SpectatorPlus) spectating mode …
…support. (#120) * NEW: added vanilla spectator mode support, inside a structure allowing other spectators mode (e.g. from other plugins) to be easily added. The vanilla support is enabled if SpectatorPlus is not installed or compatible, there isn't an option in the config for that (useless, if you don't want SpectatorPlus, uninstall it). This said, such an option can be added if someone request it.
- Loading branch information
1 parent
3205469
commit 6af5432
Showing
7 changed files
with
296 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
src/main/java/eu/carrade/amaury/UHCReloaded/spectators/SPlusSpectatorsManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright or © or Copr. Amaury Carrade (2014 - 2016) | ||
| * | ||
| * http://amaury.carrade.eu | ||
| * | ||
| * This software is governed by the CeCILL-B license under French law and | ||
| * abiding by the rules of distribution of free software. You can use, | ||
| * modify and/ or redistribute the software under the terms of the CeCILL-B | ||
| * license as circulated by CEA, CNRS and INRIA at the following URL | ||
| * "http://www.cecill.info". | ||
| * | ||
| * As a counterpart to the access to the source code and rights to copy, | ||
| * modify and redistribute granted by the license, users are provided only | ||
| * with a limited warranty and the software's author, the holder of the | ||
| * economic rights, and the successive licensors have only limited | ||
| * liability. | ||
| * | ||
| * In this respect, the user's attention is drawn to the risks associated | ||
| * with loading, using, modifying and/or developing or reproducing the | ||
| * software by the user in light of its specific status of free software, | ||
| * that may mean that it is complicated to manipulate, and that also | ||
| * therefore means that it is reserved for developers and experienced | ||
| * professionals having in-depth computer knowledge. Users are therefore | ||
| * encouraged to load and test the software's suitability as regards their | ||
| * requirements in conditions enabling the security of their systems and/or | ||
| * data to be ensured and, more generally, to use and operate it in the | ||
| * same conditions as regards security. | ||
| * | ||
| * The fact that you are presently reading this means that you have had | ||
| * knowledge of the CeCILL-B license and that you accept its terms. | ||
| */ | ||
| package eu.carrade.amaury.UHCReloaded.spectators; | ||
|
|
||
| import eu.carrade.amaury.UHCReloaded.UHCReloaded; | ||
| import org.bukkit.entity.Player; | ||
|
|
||
|
|
||
| /** | ||
| * Spectators managed through the SpectatorsPlus Bukkit plugin by PGMann and AmauryPi. | ||
| */ | ||
| public class SPlusSpectatorsManager extends SpectatorsManager | ||
| { | ||
| UHCReloaded p; | ||
|
|
||
| public SPlusSpectatorsManager() | ||
| { | ||
| p = UHCReloaded.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setSpectating(final Player player, final boolean spectating) | ||
| { | ||
| if (player != null && p.getSpectatorPlusIntegration().isSPIntegrationEnabled()) | ||
| p.getSpectatorPlusIntegration().getSPAPI().setSpectating(player, spectating); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isSpectating(Player player) | ||
| { | ||
| return player != null && p.getSpectatorPlusIntegration().isSPIntegrationEnabled() && p.getSpectatorPlusIntegration().getSPAPI().isSpectator(player); | ||
| } | ||
| } |
98 changes: 98 additions & 0 deletions
98
src/main/java/eu/carrade/amaury/UHCReloaded/spectators/SpectatorsManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Copyright or © or Copr. Amaury Carrade (2014 - 2016) | ||
| * | ||
| * http://amaury.carrade.eu | ||
| * | ||
| * This software is governed by the CeCILL-B license under French law and | ||
| * abiding by the rules of distribution of free software. You can use, | ||
| * modify and/ or redistribute the software under the terms of the CeCILL-B | ||
| * license as circulated by CEA, CNRS and INRIA at the following URL | ||
| * "http://www.cecill.info". | ||
| * | ||
| * As a counterpart to the access to the source code and rights to copy, | ||
| * modify and redistribute granted by the license, users are provided only | ||
| * with a limited warranty and the software's author, the holder of the | ||
| * economic rights, and the successive licensors have only limited | ||
| * liability. | ||
| * | ||
| * In this respect, the user's attention is drawn to the risks associated | ||
| * with loading, using, modifying and/or developing or reproducing the | ||
| * software by the user in light of its specific status of free software, | ||
| * that may mean that it is complicated to manipulate, and that also | ||
| * therefore means that it is reserved for developers and experienced | ||
| * professionals having in-depth computer knowledge. Users are therefore | ||
| * encouraged to load and test the software's suitability as regards their | ||
| * requirements in conditions enabling the security of their systems and/or | ||
| * data to be ensured and, more generally, to use and operate it in the | ||
| * same conditions as regards security. | ||
| * | ||
| * The fact that you are presently reading this means that you have had | ||
| * knowledge of the CeCILL-B license and that you accept its terms. | ||
| */ | ||
| package eu.carrade.amaury.UHCReloaded.spectators; | ||
|
|
||
| import eu.carrade.amaury.UHCReloaded.UHCReloaded; | ||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.entity.Player; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
|
|
||
| /** | ||
| * Represents a spectator manager, able to put players in or remove players from spectator mode. | ||
| */ | ||
| public abstract class SpectatorsManager | ||
| { | ||
| /** | ||
| * Changes the spectating mode of a player. | ||
| * | ||
| * @param player The player. | ||
| * @param spectating {@code true} to enable the spectator mode; {@code false} to disable it. | ||
| */ | ||
| public abstract void setSpectating(final Player player, final boolean spectating); | ||
|
|
||
| /** | ||
| * Checks if the given player is currently spectating. | ||
| * | ||
| * @param player The player. | ||
| * | ||
| * @return {@code true} if spectating. | ||
| */ | ||
| public abstract boolean isSpectating(final Player player); | ||
|
|
||
| /** | ||
| * Changes the spectating mode of a player. | ||
| * | ||
| * @param playerID The player's UUID. | ||
| * @param spectating {@code true} to enable the spectator mode; {@code false} to disable it. | ||
| */ | ||
| public void setSpectating(final UUID playerID, final boolean spectating) | ||
| { | ||
| setSpectating(Bukkit.getPlayer(playerID), spectating); | ||
| } | ||
|
|
||
| /** | ||
| * Checks if the given player is currently spectating. | ||
| * | ||
| * @param playerID The player's UUID. | ||
| * | ||
| * @return {@code true} if spectating. | ||
| */ | ||
| public boolean isSpectating(final UUID playerID) | ||
| { | ||
| return isSpectating(Bukkit.getPlayer(playerID)); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @return an instance of a {@link SpectatorsManager}: {@link SPlusSpectatorsManager} if the | ||
| * SpectatorPlus plugin is available; {@link VanillaSpectatorsManager} else. | ||
| */ | ||
| public static SpectatorsManager getInstance() | ||
| { | ||
| if (UHCReloaded.get().getSpectatorPlusIntegration().isSPIntegrationEnabled()) | ||
| return new SPlusSpectatorsManager(); | ||
| else | ||
| return new VanillaSpectatorsManager(); | ||
| } | ||
| } |
Oops, something went wrong.