Skip to content

Commit 56ecd2c

Browse files
1.3.1
Bug Fixes
1 parent 0914f9a commit 56ecd2c

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

src/main/java/io/github/apickledwalrus/placeholderaddon/mvdwapi/MvdwAPIEvent.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ public class MvdwAPIEvent extends Event {
1212
private String placeholder;
1313
private String result;
1414

15-
public MvdwAPIEvent(Player player, String placeholder) {
15+
public MvdwAPIEvent(Player player, String placeholder, boolean isAsynchronous) {
16+
super(isAsynchronous);
1617
this.placeholder = placeholder;
1718
this.player = player;
1819
}

src/main/java/io/github/apickledwalrus/placeholderaddon/mvdwapi/MvdwAPIListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public static void registerPlaceholder(Plugin plugin, String placeholder) {
1616

1717
@Override
1818
public String onPlaceholderReplace(PlaceholderReplaceEvent event) {
19-
MvdwAPIEvent e = new MvdwAPIEvent(event.getPlayer(), event.getPlaceholder());
20-
Bukkit.getServer().getPluginManager().callEvent(e);
19+
MvdwAPIEvent e = new MvdwAPIEvent(event.getPlayer(), event.getPlaceholder(), !Bukkit.getServer().isPrimaryThread());
20+
Bukkit.getPluginManager().callEvent(e);
2121
return e.getResult();
2222
}
2323

src/main/java/io/github/apickledwalrus/placeholderaddon/placeholderapi/PlaceholderAPIEvent.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public class PlaceholderAPIEvent extends Event {
1313
private String prefix;
1414
private String result;
1515

16-
public PlaceholderAPIEvent(String identifier, Player player, String prefix) {
16+
public PlaceholderAPIEvent(String identifier, Player player, String prefix, boolean isAsynchronous) {
17+
super(isAsynchronous);
1718
this.prefix = prefix;
1819
this.identifier = identifier;
1920
this.player = player;

src/main/java/io/github/apickledwalrus/placeholderaddon/placeholderapi/PlaceholderAPIListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public String getVersion() {
3232

3333
@Override
3434
public String onPlaceholderRequest(Player player, String identifier) {
35-
PlaceholderAPIEvent event = new PlaceholderAPIEvent(identifier, player, prefix);
36-
Bukkit.getServer().getPluginManager().callEvent(event);
35+
PlaceholderAPIEvent event = new PlaceholderAPIEvent(identifier, player, prefix, !Bukkit.getServer().isPrimaryThread());
36+
Bukkit.getPluginManager().callEvent(event);
3737
return event.getResult();
3838
}
3939

src/main/java/io/github/apickledwalrus/placeholderaddon/skript/expressions/ExprMvdwResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public Class<?>[] acceptChange(final ChangeMode mode) {
7070
public void change(Event e, Object[] delta, ChangeMode mode) {
7171
switch (mode) {
7272
case SET:
73-
((MvdwAPIEvent) e).setResult((String) delta[0]);
73+
((MvdwAPIEvent) e).setResult(String.valueOf(delta[0]));
7474
break;
7575
case RESET:
7676
case DELETE:

src/main/java/io/github/apickledwalrus/placeholderaddon/skript/expressions/ExprPapiResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public Class<?>[] acceptChange(final ChangeMode mode) {
7171
public void change(Event e, Object[] delta, ChangeMode mode) {
7272
switch (mode) {
7373
case SET:
74-
((PlaceholderAPIEvent) e).setResult((String) delta[0]);
74+
((PlaceholderAPIEvent) e).setResult(String.valueOf(delta[0]));
7575
break;
7676
case RESET:
7777
case DELETE:

src/main/resources/plugin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: skript-placeholders
22
main: io.github.apickledwalrus.placeholderaddon.Main
3-
version: 1.3
3+
version: 1.3.1
44
authors: [Pikachu, APickledWalrus]
55
description: Allows using and registering placeholders with PlaceholderAPI and MVdWPlaceholderAPI in Skript.
66
website: https://github.com/APickledWalrus/skript-placeholders

0 commit comments

Comments
 (0)