Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-29 14:06:30 +01:00
Code Issues Projects Releases Wiki Activity

Style.

Browse Source
This commit is contained in:
main() 2012-11-05 16:40:06 +01:00
parent 63f8811b67
commit 73e394d5ec
6 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/onarandombox/MultiverseCore/api/Core.java
View File

@ -18,7 +18,6 @@ import com.onarandombox.MultiverseCore.utils.SimpleBlockSafety;
import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation; import com.onarandombox.MultiverseCore.utils.SimpleLocationManipulation;
import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter; import com.onarandombox.MultiverseCore.utils.SimpleSafeTTeleporter;
import com.onarandombox.MultiverseCore.utils.VaultHandler; import com.onarandombox.MultiverseCore.utils.VaultHandler;
import com.onarandombox.MultiverseCore.utils.WorldManager;
import com.pneumaticraft.commandhandler.CommandHandler; import com.pneumaticraft.commandhandler.CommandHandler;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

9
src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java
View File

@ -258,8 +258,15 @@ public class PermissionTools {
return true; return true;
} }
/**
* Checks to see if a player can bypass the player limit.
*
* @param toWorld The world travelling to.
* @param teleporter The player that initiated the teleport.
* @param teleportee The player travelling.
* @return True if they can bypass the player limit.
*/
public boolean playerCanBypassPlayerLimit(MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) { public boolean playerCanBypassPlayerLimit(MultiverseWorld toWorld, CommandSender teleporter, Player teleportee) {
if (teleporter == null) { if (teleporter == null) {
teleporter = teleportee; teleporter = teleportee;
} }

7
src/main/java/com/onarandombox/MultiverseCore/utils/VaultHandler.java
View File

@ -24,8 +24,8 @@ public class VaultHandler implements Listener {
private boolean setupVaultEconomy() { private boolean setupVaultEconomy() {
if (Bukkit.getPluginManager().getPlugin("Vault") != null) { if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
final RegisteredServiceProvider<Economy> economyProvider final RegisteredServiceProvider<Economy> economyProvider =
= Bukkit.getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class); Bukkit.getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
if (economyProvider != null) { if (economyProvider != null) {
Logging.fine("Vault economy enabled."); Logging.fine("Vault economy enabled.");
economy = economyProvider.getProvider(); economy = economyProvider.getProvider();
@ -41,6 +41,9 @@ public class VaultHandler implements Listener {
return (economy != null); return (economy != null);
} }
/**
* Listens for Vault plugin events.
*/
private class VaultListener implements Listener { private class VaultListener implements Listener {
@EventHandler @EventHandler
private void vaultEnabled(PluginEnableEvent event) { private void vaultEnabled(PluginEnableEvent event) {