Fix hotbar message spam and translations
This commit is contained in:
parent
7f26cf911f
commit
8150624ce1
|
@ -19,10 +19,14 @@ import tc.oc.pgm.match.MatchScheduler;
|
||||||
import tc.oc.pgm.match.MatchScope;
|
import tc.oc.pgm.match.MatchScope;
|
||||||
import tc.oc.pgm.match.inject.ForRunningMatch;
|
import tc.oc.pgm.match.inject.ForRunningMatch;
|
||||||
|
|
||||||
|
import static tc.oc.minecraft.protocol.MinecraftVersion.lessThan;
|
||||||
|
import static tc.oc.minecraft.protocol.MinecraftVersion.MINECRAFT_1_8;
|
||||||
|
|
||||||
@ListenerScope(MatchScope.RUNNING)
|
@ListenerScope(MatchScope.RUNNING)
|
||||||
public class StatsPlayerFacet implements MatchPlayerFacet, Listener {
|
public class StatsPlayerFacet implements MatchPlayerFacet, Listener {
|
||||||
|
|
||||||
private static final int DISPLAY_TICKS = 60;
|
private static final int DISPLAY_TICKS = 60;
|
||||||
|
private static final int LEGACY_TICKS = 2;
|
||||||
private static final DecimalFormat FORMAT = new DecimalFormat("0.00");
|
private static final DecimalFormat FORMAT = new DecimalFormat("0.00");
|
||||||
|
|
||||||
private final MatchScheduler scheduler;
|
private final MatchScheduler scheduler;
|
||||||
|
@ -49,8 +53,9 @@ public class StatsPlayerFacet implements MatchPlayerFacet, Listener {
|
||||||
if (task != null) {
|
if (task != null) {
|
||||||
task.cancel();
|
task.cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
task = scheduler.createRepeatingTask(1, 1, new Runnable() {
|
task = scheduler.createRepeatingTask(1, 1, new Runnable() {
|
||||||
int ticks = DISPLAY_TICKS;
|
int ticks = lessThan(MINECRAFT_1_8, player.getBukkit().getProtocolVersion()) ? LEGACY_TICKS : DISPLAY_TICKS;
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
if (--ticks > 0) {
|
if (--ticks > 0) {
|
||||||
|
|
|
@ -110,7 +110,7 @@ public class Audiences extends AbstractAudiences<CommandSender> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendHotbarMessage(BaseComponent message) {
|
public void sendHotbarMessage(BaseComponent message) {
|
||||||
sender().sendMessage(ChatMessageType.ACTION_BAR, message);
|
sender().sendMessage(ChatMessageType.ACTION_BAR, ComponentRenderers.render(message, sender()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue