mirror of
https://github.com/Multiverse/Multiverse-Core.git
synced 2024-10-01 00:27:27 +02:00
Style-fixes... They're driving me mad...
This commit is contained in:
parent
9d16b7c445
commit
5b056388a0
@ -23,6 +23,9 @@ public abstract class MultiverseCommand extends Command {
|
|||||||
* The reference to the core.
|
* The reference to the core.
|
||||||
*/
|
*/
|
||||||
protected MultiverseCore plugin;
|
protected MultiverseCore plugin;
|
||||||
|
/**
|
||||||
|
* The reference to {@link MVMessaging}.
|
||||||
|
*/
|
||||||
protected MVMessaging messaging;
|
protected MVMessaging messaging;
|
||||||
|
|
||||||
public MultiverseCommand(MultiverseCore plugin) {
|
public MultiverseCommand(MultiverseCore plugin) {
|
||||||
|
@ -26,10 +26,18 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable {
|
|||||||
this.l = l;
|
this.l = l;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link Location} of the portal-block that was touched.
|
||||||
|
* @return The {@link Location} of the portal-block that was touched.
|
||||||
|
*/
|
||||||
public Location getBlockTouched() {
|
public Location getBlockTouched() {
|
||||||
return this.l;
|
return this.l;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link Player} that's touching the portal.
|
||||||
|
* @return The {@link Player} that's touching the portal.
|
||||||
|
*/
|
||||||
public Player getPlayer() {
|
public Player getPlayer() {
|
||||||
return this.p;
|
return this.p;
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
|
|||||||
import org.bukkit.event.Event;
|
import org.bukkit.event.Event;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called
|
* Called when a player is respawning.
|
||||||
*/
|
*/
|
||||||
public class MVRespawnEvent extends Event {
|
public class MVRespawnEvent extends Event {
|
||||||
private Player player;
|
private Player player;
|
||||||
@ -27,18 +27,34 @@ public class MVRespawnEvent extends Event {
|
|||||||
this.respawnMethod = respawnMethod;
|
this.respawnMethod = respawnMethod;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link Player} that's respawning.
|
||||||
|
* @return The {@link Player} that's respawning.
|
||||||
|
*/
|
||||||
public Player getPlayer() {
|
public Player getPlayer() {
|
||||||
return this.player;
|
return this.player;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the respawn-method.
|
||||||
|
* @return The respawn-method.
|
||||||
|
*/
|
||||||
public String getRespawnMethod() {
|
public String getRespawnMethod() {
|
||||||
return this.respawnMethod;
|
return this.respawnMethod;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the player's respawn-{@link Location}.
|
||||||
|
* @return The player's respawn-{@link Location}.
|
||||||
|
*/
|
||||||
public Location getPlayersRespawnLocation() {
|
public Location getPlayersRespawnLocation() {
|
||||||
return this.location;
|
return this.location;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the player's respawn-{@link Location}.
|
||||||
|
* @param l The new respawn-{@link Location}.
|
||||||
|
*/
|
||||||
public void setRespawnLocation(Location l) {
|
public void setRespawnLocation(Location l) {
|
||||||
this.location = l;
|
this.location = l;
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,9 @@ import org.bukkit.event.entity.FoodLevelChangeEvent;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Multiverse's {@link EntityListener}.
|
||||||
|
*/
|
||||||
public class MVEntityListener extends EntityListener {
|
public class MVEntityListener extends EntityListener {
|
||||||
|
|
||||||
private MultiverseCore plugin;
|
private MultiverseCore plugin;
|
||||||
@ -73,6 +76,7 @@ public class MVEntityListener extends EntityListener {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle Animal/Monster Spawn settings, seems like a more concrete method than using CraftBukkit.
|
* Handle Animal/Monster Spawn settings, seems like a more concrete method than using CraftBukkit.
|
||||||
|
* @param event The event.
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onCreatureSpawn(CreatureSpawnEvent event) {
|
public void onCreatureSpawn(CreatureSpawnEvent event) {
|
||||||
|
@ -16,6 +16,9 @@ import org.bukkit.event.server.ServerListener;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Multiverse's {@link ServerListener}.
|
||||||
|
*/
|
||||||
public class MVPluginListener extends ServerListener {
|
public class MVPluginListener extends ServerListener {
|
||||||
|
|
||||||
private MultiverseCore plugin;
|
private MultiverseCore plugin;
|
||||||
@ -24,7 +27,10 @@ public class MVPluginListener extends ServerListener {
|
|||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Keep an eye out for Plugins which we can utilize. */
|
/**
|
||||||
|
* Keep an eye out for Plugins which we can utilize.
|
||||||
|
* @param event The event.
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onPluginEnable(PluginEnableEvent event) {
|
public void onPluginEnable(PluginEnableEvent event) {
|
||||||
// Let AllPay handle all econ plugin loadings, only go for econ plugins we support
|
// Let AllPay handle all econ plugin loadings, only go for econ plugins we support
|
||||||
@ -38,7 +44,10 @@ public class MVPluginListener extends ServerListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** We'll check if any of the plugins we rely on decide to Disable themselves. */
|
/**
|
||||||
|
* We'll check if any of the plugins we rely on decide to Disable themselves.
|
||||||
|
* @param event The event.
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onPluginDisable(PluginDisableEvent event) {
|
public void onPluginDisable(PluginDisableEvent event) {
|
||||||
// TODO: Disable econ when it disables.
|
// TODO: Disable econ when it disables.
|
||||||
|
@ -11,11 +11,17 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
|
|||||||
import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
|
import com.onarandombox.MultiverseCore.utils.SafeTTeleporter;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.event.Event.Type;
|
||||||
import org.bukkit.event.player.PlayerListener;
|
import org.bukkit.event.player.PlayerListener;
|
||||||
import org.bukkit.event.player.PlayerPortalEvent;
|
import org.bukkit.event.player.PlayerPortalEvent;
|
||||||
|
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Multiverse's second {@link PlayerListener}.
|
||||||
|
* <p>
|
||||||
|
* Used to double-monitor {@link Type#PLAYER_PORTAL}.
|
||||||
|
*/
|
||||||
public class MVPortalAdjustListener extends PlayerListener {
|
public class MVPortalAdjustListener extends PlayerListener {
|
||||||
|
|
||||||
private MultiverseCore plugin;
|
private MultiverseCore plugin;
|
||||||
|
@ -13,6 +13,9 @@ import org.bukkit.event.weather.ThunderChangeEvent;
|
|||||||
import org.bukkit.event.weather.WeatherChangeEvent;
|
import org.bukkit.event.weather.WeatherChangeEvent;
|
||||||
import org.bukkit.event.weather.WeatherListener;
|
import org.bukkit.event.weather.WeatherListener;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Multiverse's {@link WeatherListener}.
|
||||||
|
*/
|
||||||
public class MVWeatherListener extends WeatherListener {
|
public class MVWeatherListener extends WeatherListener {
|
||||||
private MultiverseCore plugin;
|
private MultiverseCore plugin;
|
||||||
|
|
||||||
@ -22,7 +25,6 @@ public class MVWeatherListener extends WeatherListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onWeatherChange(WeatherChangeEvent event) {
|
public void onWeatherChange(WeatherChangeEvent event) {
|
||||||
|
|
||||||
MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld().getName());
|
MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld().getName());
|
||||||
if (world != null) {
|
if (world != null) {
|
||||||
// If it's going to start raining and we have weather disabled
|
// If it's going to start raining and we have weather disabled
|
||||||
@ -32,7 +34,6 @@ public class MVWeatherListener extends WeatherListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onThunderChange(ThunderChangeEvent event) {
|
public void onThunderChange(ThunderChangeEvent event) {
|
||||||
|
|
||||||
MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld().getName());
|
MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld().getName());
|
||||||
if (world != null) {
|
if (world != null) {
|
||||||
// If it's going to start raining and we have weather disabled
|
// If it's going to start raining and we have weather disabled
|
||||||
|
Loading…
Reference in New Issue
Block a user