Upstream/Challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2025-01-16 05:01:38 +01:00
Code Issues Projects Releases Wiki Activity

Fixed reference for levels too

Browse Source
This commit is contained in:
tastybento 2019-01-30 08:03:23 -08:00
parent 7e0487113d
commit 8becd9c08b
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/challenges/ChallengesManager.java
View File

@ -237,7 +237,7 @@ public class ChallengesManager
if (!silent) if (!silent)
{ {
user.sendMessage("challenges.admin.import.overwriting", user.sendMessage("challenges.admin.import.overwriting",
"[object]", level.getFriendlyName()); "[challenge]", level.getFriendlyName());
} }
} }
} }

55
src/main/java/world/bentobox/challenges/database/object/Challenge.java
View File

@ -1,12 +1,19 @@
package world.bentobox.challenges.database.object; package world.bentobox.challenges.database.object;
import com.google.gson.annotations.Expose; import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.*;
import com.google.gson.annotations.Expose;
import world.bentobox.bentobox.api.configuration.ConfigComment; import world.bentobox.bentobox.api.configuration.ConfigComment;
import world.bentobox.bentobox.database.objects.DataObject; import world.bentobox.bentobox.database.objects.DataObject;
@ -50,9 +57,9 @@ public class Challenge implements DataObject
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Variables // Section: Variables
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ConfigComment("") @ConfigComment("")
@ConfigComment("Unique name of the challenge") @ConfigComment("Unique name of the challenge")
@ -108,9 +115,9 @@ public class Challenge implements DataObject
@Expose @Expose
private String level = ""; private String level = "";
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Requirement related // Section: Requirement related
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ConfigComment("") @ConfigComment("")
@ConfigComment("") @ConfigComment("")
@ -184,9 +191,9 @@ public class Challenge implements DataObject
private int searchRadius = 10; private int searchRadius = 10;
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Rewards // Section: Rewards
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ConfigComment("") @ConfigComment("")
@ConfigComment("") @ConfigComment("")
@ -218,9 +225,9 @@ public class Challenge implements DataObject
private List<String> rewardCommands = new ArrayList<>(); private List<String> rewardCommands = new ArrayList<>();
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Repeat Rewards // Section: Repeat Rewards
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ConfigComment("") @ConfigComment("")
@ -261,9 +268,9 @@ public class Challenge implements DataObject
private List<String> repeatRewardCommands = new ArrayList<>(); private List<String> repeatRewardCommands = new ArrayList<>();
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Getters // Section: Getters
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/** /**
@ -281,7 +288,7 @@ public class Challenge implements DataObject
*/ */
public String getFriendlyName() public String getFriendlyName()
{ {
return friendlyName; return friendlyName.isEmpty() ? uniqueId : friendlyName;
} }
@ -582,9 +589,9 @@ public class Challenge implements DataObject
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Setters // Section: Setters
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/** /**
@ -970,9 +977,9 @@ public class Challenge implements DataObject
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Other methods // Section: Other methods
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/** /**