F Show Async Calling
This commit is contained in:
parent
7d3c4d6e33
commit
c22e3a5227
@ -84,8 +84,11 @@ public class CmdShow extends FCommand {
|
||||
}
|
||||
|
||||
List<FancyMessage> fancy = new ArrayList<>();
|
||||
for (String raw : show) {
|
||||
String parsed = TagUtil.parsePlain(faction, context.fPlayer, raw); // use relations
|
||||
List<String> finalShow = show;
|
||||
Faction finalFaction = faction;
|
||||
instance.getServer().getScheduler().runTaskAsynchronously(instance, () -> {
|
||||
for (String raw : finalShow) {
|
||||
String parsed = TagUtil.parsePlain(finalFaction, context.fPlayer, raw); // use relations
|
||||
if (parsed == null) {
|
||||
continue; // Due to minimal f show.
|
||||
}
|
||||
@ -95,7 +98,7 @@ public class CmdShow extends FCommand {
|
||||
}
|
||||
|
||||
if (TagUtil.hasFancy(parsed)) {
|
||||
List<FancyMessage> localFancy = TagUtil.parseFancy(faction, context.fPlayer, parsed);
|
||||
List<FancyMessage> localFancy = TagUtil.parseFancy(finalFaction, context.fPlayer, parsed);
|
||||
if (localFancy != null)
|
||||
fancy.addAll(localFancy);
|
||||
|
||||
@ -115,6 +118,7 @@ public class CmdShow extends FCommand {
|
||||
}
|
||||
}
|
||||
instance.getServer().getScheduler().runTask(instance, () -> context.sendFancyMessage(fancy));
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -39,9 +39,9 @@ public abstract class FRelationCommand extends FCommand {
|
||||
@Override
|
||||
public void perform(CommandContext context) {
|
||||
Faction them = context.argAsFaction(0);
|
||||
if (them == null) {
|
||||
return;
|
||||
}
|
||||
if (them == null) return;
|
||||
|
||||
if(!context.faction.isNormal()) return;
|
||||
|
||||
if (!them.isNormal()) {
|
||||
context.msg(TL.COMMAND_RELATIONS_ALLTHENOPE);
|
||||
|
Loading…
Reference in New Issue
Block a user