Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-21 03:12:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-12-02 09:01:14 -06:00
commit c98d678183
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.songoda</groupId>
<artifactId>skyblock</artifactId>
<version>2.3.18</version>
<version>2.3.19</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

7
src/main/java/com/songoda/skyblock/command/commands/island/InformationCommand.java
View File

@ -59,6 +59,13 @@ public class InformationCommand extends SubCommand {
PlayerData playerData = plugin.getPlayerDataManager().getPlayerData(player);
if (playerData.isPreview()) {
messageManager.sendMessage(player,
configLoad.getString("Command.Island.Information.Previewing.Message"));
soundManager.playSound(player, CompatibleSound.BLOCK_ANVIL_LAND.getSound(), 1.0F, 1.0F);
return;
}
if (islandOwnerUUID == null) {
if (islandManager.getIsland(player) == null) {
messageManager.sendMessage(player,

4
src/main/java/com/songoda/skyblock/island/IslandManager.java
View File

@ -580,10 +580,10 @@ public class IslandManager {
}
// TODO - Find a way to delete also offline players
if (configLoad.getBoolean("Island.Deletion.ClearInventory", false)){
if (configLoad.getBoolean("Island.Deletion.ClearInventory", false) && !playerData.isPreview()) {
player.getInventory().clear();
}
if (configLoad.getBoolean("Island.Deletion.ClearEnderChest", false)){
if (configLoad.getBoolean("Island.Deletion.ClearEnderChest", false) && !playerData.isPreview()) {
player.getEnderChest().clear();
}

7
src/main/java/com/songoda/skyblock/world/WorldManager.java
View File

@ -58,20 +58,19 @@ public class WorldManager {
if (normalWorld == null) {
Bukkit.getServer().getLogger().log(Level.INFO, "SkyBlock | Info: Generating Normal World '" + normalWorldName + "'.");
normalWorld = WorldCreator.name(normalWorldName).type(WorldType.FLAT).environment(normalWorldEnvironment).generator(normalWorldWorldGenerator).createWorld();
Bukkit.getServer().getScheduler().runTask(plugin, () -> registerMultiverse(normalWorldName, normalWorldEnvironment, normalWorldGeneratorName));
registerMultiverse(normalWorldName, normalWorldEnvironment, normalWorldGeneratorName);
}
if (netherWorld == null && netherWorldEnabled) {
Bukkit.getServer().getLogger().log(Level.INFO, "SkyBlock | Info: Generating Nether World '" + netherWorldName + "'.");
netherWorld = WorldCreator.name(netherWorldName).type(WorldType.FLAT).environment(netherWorldEnvironment).generator(netherWorldWorldGenerator).createWorld();
Bukkit.getServer().getScheduler().runTask(plugin, () -> registerMultiverse(netherWorldName, netherWorldEnvironment, netherWorldGeneratorName));
registerMultiverse(netherWorldName, netherWorldEnvironment, netherWorldGeneratorName);
}
if (endWorld == null && endWorldEnabled) {
Bukkit.getServer().getLogger().log(Level.INFO, "SkyBlock | Info: Generating Void World '" + endWorldName + "'.");
endWorld = WorldCreator.name(endWorldName).type(WorldType.FLAT).environment(endWorldEnvironment).generator(endWorldWorldGenerator).createWorld();
Bukkit.getServer().getScheduler().runTask(plugin, () -> registerMultiverse(endWorldName, endWorldEnvironment, endWorldGeneratorName));
registerMultiverse(endWorldName, endWorldEnvironment, endWorldGeneratorName);
}
if (normalWorld != null)

2
src/main/resources/language.yml
View File

@ -841,6 +841,8 @@ Command:
Message: '&bSkyBlock &8| &cError&8: &eYou don''t have permission to view information on other players'' Islands.'
Owner:
Message: '&bSkyBlock &8| &cError&8: &eYou are not an Island Owner.'
Previewing:
Message: '&bSkyBlock &8| &cError&8: &eYou are currently previewing an island.'
Info:
Message: '&f&oOpens the Island Information menu.'
Reset:

4
src/main/resources/plugin.yml
View File

@ -6,8 +6,8 @@ description: A unique SkyBlock plugin
author: Songoda
authors: [ Fabrimat ]
softdepend: [ HolographicDisplays, Holograms, CMI, PlaceholderAPI, MVdWPlaceholderAPI, Vault, Reserve, PlayerPoints,
LeaderHeads, EpicSpawners, UltimateStacker, WorldEdit, Residence, CoreProtect, CMIEInjector,
Multiverse-Core, ProtocolLib ]
LeaderHeads, EpicSpawners, UltimateStacker, WorldEdit, Residence, CoreProtect, CMIEInjector ]
loadbefore: [Multiverse-Core, ProtocolLib]
commands:
island:
description: Island command