EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 20:45:28 +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." +