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

Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable

Browse Source 
# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
This commit is contained in:
nossr50
2019-04-09 14:38:49 -07:00
parent b63280a2aa f7b07899c1
commit 5facd8d412
10 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/config/hocon/SalvageableSerializer.java
View File

@ -1,6 +1,5 @@
package com.gmail.nossr50.config.hocon;
import com.gmail.nossr50.skills.repair.repairables.Repairable;
import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
import com.google.common.reflect.TypeToken;
import ninja.leaping.configurate.ConfigurationNode;
@ -8,7 +7,6 @@ import ninja.leaping.configurate.objectmapping.ObjectMappingException;
import ninja.leaping.configurate.objectmapping.serialize.TypeSerializer;
import ninja.leaping.configurate.util.EnumLookup;
import java.util.List;
import java.util.Optional;
public class SalvageableSerializer implements TypeSerializer<Salvageable> {

2
src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionExploitAcrobatics.java
View File

@ -9,7 +9,7 @@ public class ConfigSectionExploitAcrobatics {
private static final int ACROBATIC_LOCATION_LIMIT_DEFAULT = 50;
private static final boolean PREVENT_ACROBATICS_ABUSE_DEFAULT = true;
private static final int TELEPORT_COOLDOWN_DEFAULT = 30;
private static final int ROLL_XP_GAIN_CD_DEFAULT = 60;
private static final int ROLL_XP_GAIN_CD_DEFAULT = 10;
@Setting(value = "Player-Fall-Location-Tracking",
comment = "The amount of locations to keep track of for player falls." +

3
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@ -1,6 +1,5 @@
package com.gmail.nossr50.skills.acrobatics;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@ -28,7 +27,7 @@ public class AcrobaticsManager extends SkillManager {
}
private long rollXPCooldown = 0;
private long rollXPInterval; //1 Minute
private long rollXPInterval;
private long rollXPIntervalLengthen = (1000 * 10); //10 Seconds
public boolean canGainRollXP()

2
src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java
View File

@ -1,12 +1,10 @@
package com.gmail.nossr50.skills.mining;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.skills.RankUtils;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.entity.EntityDamageByEntityEvent;

1
src/main/java/com/gmail/nossr50/skills/mining/Mining.java
View File

@ -5,7 +5,6 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.Misc;
import net.royawesome.jlibnoise.module.combiner.Min;
import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.inventory.ItemStack;

5
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -11,7 +11,10 @@ import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.skills.AbilityCooldownTask;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.util.*;
import com.gmail.nossr50.util.BlockUtils;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.player.NotificationManager;
import com.gmail.nossr50.util.random.RandomChanceUtil;
import com.gmail.nossr50.util.skills.RankUtils;

1
src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java
View File

@ -5,7 +5,6 @@ import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.util.ItemUtils;
import org.bukkit.Material;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

2
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java
View File

@ -5,8 +5,6 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Entity;
import java.io.IOException;
public class NullChunkManager implements ChunkManager {
@Override