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

Second Smelt makes use of its own section in Bonus Drops in config.yml

Browse Source 
Co-authored-by: t00thpick1 <t00thpick1dirko@gmail.com>
This commit is contained in:
nossr50
2020-07-13 12:31:30 -07:00
parent 7eae59a0b3
commit fdd951f1f1
176 changed files with 642 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java
View File

@ -14,7 +14,7 @@ public class CheckDateTask extends BukkitRunnable {
}
// Set up jokes
new AprilTask().runTaskTimer(mcMMO.p, 1L * 60L * Misc.TICK_CONVERSION_FACTOR, 10L * 60L * Misc.TICK_CONVERSION_FACTOR);
new AprilTask().runTaskTimer(mcMMO.p, 60L * Misc.TICK_CONVERSION_FACTOR, 10L * 60L * Misc.TICK_CONVERSION_FACTOR);
mcMMO.getHolidayManager().registerAprilCommand();
// Jokes deployed.

8
src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java
View File

@ -16,9 +16,9 @@ public class CleanBackupsTask extends BukkitRunnable {
@Override
public void run() {
List<Integer> savedDays = new ArrayList<Integer>();
HashMap<Integer, List<Integer>> savedYearsWeeks = new HashMap<Integer, List<Integer>>();
List<File> toDelete = new ArrayList<File>();
List<Integer> savedDays = new ArrayList<>();
HashMap<Integer, List<Integer>> savedYearsWeeks = new HashMap<>();
List<File> toDelete = new ArrayList<>();
int amountTotal = 0;
int amountDeleted = 0;
@ -58,7 +58,7 @@ public class CleanBackupsTask extends BukkitRunnable {
continue;
}
else {
List<Integer> savedWeeks = savedYearsWeeks.computeIfAbsent(year, k -> new ArrayList<Integer>());
List<Integer> savedWeeks = savedYearsWeeks.computeIfAbsent(year, k -> new ArrayList<>());
if (!savedWeeks.contains(weekOfYear) && Config.getInstance().getKeepWeeklyPastMonth()) {
// Keep one backup of each week

4
src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java
View File

@ -18,8 +18,8 @@ public class PartyAutoKickTask extends BukkitRunnable {
@Override
public void run() {
HashMap<OfflinePlayer, Party> toRemove = new HashMap<OfflinePlayer, Party>();
List<UUID> processedPlayers = new ArrayList<UUID>();
HashMap<OfflinePlayer, Party> toRemove = new HashMap<>();
List<UUID> processedPlayers = new ArrayList<>();
long currentTime = System.currentTimeMillis();

2
src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java
View File

@ -96,7 +96,7 @@ public class PlayerProfileLoadingTask extends BukkitRunnable {
if (Config.getInstance().getShowStatsAfterLogin()) {
ScoreboardManager.enablePlayerStatsScoreboard(player);
new McScoreboardKeepTask(player).runTaskLater(mcMMO.p, 1 * Misc.TICK_CONVERSION_FACTOR);
new McScoreboardKeepTask(player).runTaskLater(mcMMO.p, Misc.TICK_CONVERSION_FACTOR);
}
}

5
src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java
View File

@ -23,7 +23,7 @@ import java.util.Map;
import java.util.Map.Entry;
public class BleedTimerTask extends BukkitRunnable {
private static final Map<LivingEntity, BleedContainer> bleedList = new HashMap<LivingEntity, BleedContainer>();
private static final Map<LivingEntity, BleedContainer> bleedList = new HashMap<>();
private static boolean isIterating = false;
@Override
@ -71,8 +71,7 @@ public class BleedTimerTask extends BukkitRunnable {
//Count Armor
for(ItemStack armorPiece : ((Player) target).getInventory().getArmorContents())
{
if(armorPiece != null)
armorCount++;
armorCount++;
}
} else {

2
src/main/java/com/gmail/nossr50/runnables/skills/DelayedCropReplant.java
View File

@ -98,7 +98,7 @@ public class DelayedCropReplant extends BukkitRunnable {
}
private class markPlantAsOld extends BukkitRunnable {
private static class markPlantAsOld extends BukkitRunnable {
private final Location cropLoc;