- Add Placeholder: %notquests_player_questpoints%

- Fix another Placeholder
AlessioGr · Sep 20, 2021 · ca365c7 · ca365c7
1 parent 98fc687
commit ca365c7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 3 deletions.
diff --git a/.gradle/7.1.1/executionHistory/executionHistory.bin b/.gradle/7.1.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.1.1/executionHistory/executionHistory.lock b/.gradle/7.1.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.1.1/fileHashes/fileHashes.bin b/.gradle/7.1.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.1.1/fileHashes/fileHashes.lock b/.gradle/7.1.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'notquests'
-version = '1.3.2'
+version = '1.3.3'
 
 repositories {
     mavenCentral()

diff --git a/build/resources/main/plugin.yml b/build/resources/main/plugin.yml
@@ -1,5 +1,5 @@
 name: NotQuests
-version: '1.3.2'
+version: '1.3.3'
 main: notquests.notquests.NotQuests
 api-version: 1.17
 authors: [ NoeX ]

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/notquests/notquests/Placeholders/QuestPlaceholders.java b/src/main/java/notquests/notquests/Placeholders/QuestPlaceholders.java
@@ -101,6 +101,15 @@ public String onPlaceholderRequest(Player player, String identifier) {
             return "";
         }
 
+        if (identifier.startsWith("player_questpoints")) {
+            final QuestPlayer questPlayer = main.getQuestPlayerManager().getQuestPlayer(player.getUniqueId());
+            if (questPlayer != null) {
+                return "" + questPlayer.getQuestPoints();
+            }
+            return "";
+
+        }
+
         if (identifier.startsWith("player_has_completed_quest_")) {
             final String questName = identifier.replace("player_has_completed_quest_", "");
             final Quest quest = main.getQuestManager().getQuest(questName);
@@ -134,7 +143,7 @@ public String onPlaceholderRequest(Player player, String identifier) {
 
         }
 
-        if (identifier.startsWith("player_iss_objective_unlocked_and_active") && identifier.contains("_from_active_quest_")) {
+        if (identifier.startsWith("player_is_objective_unlocked_and_active") && identifier.contains("_from_active_quest_")) {
             String objectiveIDName = identifier.replace("player_is_objective_unlocked_and_active_", "");
             objectiveIDName = objectiveIDName.substring(0, objectiveIDName.indexOf("_from_active_quest_"));
             final int objectiveID = Integer.parseInt(objectiveIDName);