Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-23 04:47:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://Indyuce@dev.lumine.io/bitbucket/scm/mmo/mmoitems.git

Browse Source
This commit is contained in:
Indyuce 2019-10-21 11:59:43 +02:00
commit fda2220c7c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.Indyuce</groupId>
<artifactId>MMOItems</artifactId>
<version>5.0</version>
<version>5.1-SNAPSHOT</version>
<name>MMOItems</name>
<description>A great item solution for your RPG server.</description>

3
src/main/java/net/Indyuce/mmoitems/api/CustomBlock.java
View File

@ -114,8 +114,9 @@ public class CustomBlock {
}
}
//Gets a new CustomBlock instance from a mushroom blockstate.
//Gets a new CustomBlock instance from a mushroom blockstate.
public static CustomBlock getFromData(BlockData data) {
if(!MMOItems.plugin.getCustomBlocks().isMushroomBlock(data.getMaterial())) return null;
if(!(data instanceof MultipleFacing)) return null;
MultipleFacing mfData = (MultipleFacing) data;
MushroomState state = new MushroomState(data.getMaterial(), mfData.hasFace(BlockFace.UP), mfData.hasFace(BlockFace.DOWN),

2
src/main/java/net/Indyuce/mmoitems/api/util/message/PlayerMessage.java
View File

@ -38,7 +38,7 @@ public class PlayerMessage {
if (MMOItems.plugin.getConfig().getBoolean("action-bar-display." + actionBarBooleanPath)) {
if(Bukkit.getPluginManager().isPluginEnabled("MMOCore"))
MMOCore.plugin.pauseDefaultActionBar(player.getUniqueId(), 120);
MMOCore.plugin.pauseDefaultActionBar(player.getUniqueId(), 60);
MMOItems.plugin.getNMS().sendActionBar(player, message);
}