Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-09-07 13:08:19 +02:00
Code Issues Projects Releases Wiki Activity

Track placeholders when using setText()

Browse Source
This commit is contained in:
filoghost 2014-12-23 11:42:52 +01:00
parent cf2db447b8
commit 5064c989ed
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/object/line/CraftTextLine.java
View File

@ -10,6 +10,7 @@ import com.gmail.filoghost.holographicdisplays.api.line.TextLine;
import com.gmail.filoghost.holographicdisplays.nms.interfaces.entity.NMSNameable;
import com.gmail.filoghost.holographicdisplays.nms.interfaces.entity.NMSRideable;
import com.gmail.filoghost.holographicdisplays.object.CraftHologram;
import com.gmail.filoghost.holographicdisplays.placeholder.PlaceholdersManager;
import com.gmail.filoghost.holographicdisplays.util.Offsets;
public class CraftTextLine extends CraftTouchableLine implements TextLine {
@ -37,8 +38,16 @@ public class CraftTextLine extends CraftTouchableLine implements TextLine {
public void setText(String text) {
this.text = text;
if (nmsNameble != null && text != null && !text.isEmpty()) {
nmsNameble.setCustomNameNMS(text);
if (nmsNameble != null) {
if (text != null && !text.isEmpty()) {
nmsNameble.setCustomNameNMS(text);
} else {
nmsNameble.setCustomNameNMS(null);
}
if (getParent().isAllowPlaceholders()) {
PlaceholdersManager.trackIfNecessary(this);
}
}
}
@ -143,6 +152,6 @@ public class CraftTextLine extends CraftTouchableLine implements TextLine {
@Override
public String toString() {
return "CraftTextLine [text=" + text + "]";
}
}
}

13
HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/placeholder/PlaceholdersManager.java
View File

@ -37,7 +37,7 @@ public class PlaceholdersManager {
public static void load(Plugin plugin) {
Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
@ -131,7 +131,7 @@ public class PlaceholdersManager {
}
// Players in a world count pattern.
// Players in a world count pattern.
matcher = WORLD_PATTERN.matcher(name);
while (matcher.find()) {
@ -168,7 +168,7 @@ public class PlaceholdersManager {
return String.valueOf(BungeeServerTracker.getPlayersOnline(serverName));
}
});
}
}
// Animation pattern.
matcher = ANIMATION_PATTERN.matcher(name);
@ -212,10 +212,13 @@ public class PlaceholdersManager {
}
// It could be already tracked!
if (linesToUpdate.add(lineData)) {
updatePlaceholders(lineData);
if (!linesToUpdate.add(lineData)) {
linesToUpdate.remove(lineData);
linesToUpdate.add(lineData);
}
updatePlaceholders(lineData);
} else {
// The name needs to be updated anyways.