Skip to content

Fix placeholders registered manually with the builder not having a co… #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eufranio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix placeholders registered manually with the builder not having a co… #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

group = 'me.rojo8399.placeholderapi'
version = '4.5.1'
version = '4.5.2'
description = 'An API for all of your placeholders.'

compileJava.options.encoding = 'UTF-8'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Dec 15 21:42:54 CST 2016
#Wed Sep 30 19:38:31 GFT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
2 changes: 1 addition & 1 deletion src/main/java/me/rojo8399/placeholderapi/impl/PlaceholderServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private Map<String, Object> rpt(Object s, Object o, TextTemplate template, Map<S

if (value == null && PlaceholderAPIPlugin.getInstance().getConfig().relationaltoregular && rel && empty) {
try {
value = store.parse(id, false, o, s, Optional.ofNullable(token));
value = store.parse(id, false, s, o, Optional.ofNullable(token));
} catch (Exception e) {
if (e instanceof NoValueException) {
value = null;
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/me/rojo8399/placeholderapi/impl/placeholder/Store.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,6 @@ public void fillExpansionConfig(Expansion<?, ?, ?> exp) throws Exception {
}

public ConfigurationNode getNode(Expansion<?, ?, ?> exp) {
if (exp.getConfiguration() == null) {
return null;
}
String plid = Sponge.getPluginManager().fromInstance(exp.getPlugin()).get().getId();
return PlaceholderAPIPlugin.getInstance().getRootConfig().getNode("expansions", plid,
(exp.relational() ? "rel_" : "") + exp.id(), "data");
Expand Down