1
0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-19 02:12:58 +01:00

Fixing merge conflicts

This commit is contained in:
nossr50
2019-04-03 17:25:18 -07:00
15 changed files with 710 additions and 642 deletions

View File

@@ -23,12 +23,12 @@ public final class BlockUtils {
* @param blockState target blockstate
* @param triple marks the block to give triple drops
*/
public static void markBlocksForBonusDrops(BlockState blockState, boolean triple)
public static void markDropsAsBonus(BlockState blockState, boolean triple)
{
if(triple)
blockState.setMetadata(mcMMO.tripleDropKey, mcMMO.metadataValue);
blockState.setMetadata(mcMMO.tripleDrops, mcMMO.metadataValue);
else
blockState.setMetadata(mcMMO.doubleDropKey, mcMMO.metadataValue);
blockState.setMetadata(mcMMO.doubleDrops, mcMMO.metadataValue);
}
/**