EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 12:35:27 +02:00
Code Issues Projects Releases Wiki Activity

Fixing merge conflicts

Browse Source
This commit is contained in:
nossr50
2019-04-03 17:25:18 -07:00
parent 7bbf1acd5d b68feb6992
commit 8991c2bf2c
15 changed files with 710 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/util/BlockUtils.java
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);
}
/**

2
src/main/java/com/gmail/nossr50/util/HolidayManager.java
View File

@@ -380,4 +380,4 @@
// PluginCommand command = mcMMO.p.getCommand("mcfools");
// command.setExecutor(new AprilCommand());
// }
//}
//}