Revert "Merge branch 'master' into 'master'"

This reverts merge request !304
This commit is contained in:
Beny 2020-10-06 20:06:11 -04:00
parent d6d0f80c7c
commit a4c200146f

View File

@ -2,9 +2,6 @@ package com.eu.habbo.habbohotel.commands;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.gameclients.GameClient;
import com.eu.habbo.habbohotel.rooms.RoomChatMessageBubbles;
import java.util.Arrays;
public class WordQuizCommand extends Command { public class WordQuizCommand extends Command {
public WordQuizCommand() { public WordQuizCommand() {
@ -14,23 +11,23 @@ public class WordQuizCommand extends Command {
@Override @Override
public boolean handle(GameClient gameClient, String[] params) throws Exception { public boolean handle(GameClient gameClient, String[] params) throws Exception {
if (!gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasActiveWordQuiz()) { if (!gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasActiveWordQuiz()) {
if(params.length == 1) {
gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.description.cmd_word_quiz"), RoomChatMessageBubbles.ALERT);
return true;
}
StringBuilder question = new StringBuilder(); StringBuilder question = new StringBuilder();
int duration = 60; int duration = 60;
try { if (params.length > 2) {
duration = Integer.parseInt(params[params.length-1]); for (int i = 1; i < params.length - 1; i++) {
params = Arrays.copyOf(params, params.length-1);
}
catch (Exception e) {}
for (int i = 1; i < params.length; i++) {
question.append(" ").append(params[i]); question.append(" ").append(params[i]);
} }
try {
duration = Integer.valueOf(params[params.length - 1]);
} catch (Exception e) {
question.append(" ").append(params[params.length - 1]);
}
} else {
question = new StringBuilder(params[1]);
}
gameClient.getHabbo().getHabboInfo().getCurrentRoom().startWordQuiz(question.toString(), duration * 1000); gameClient.getHabbo().getHabboInfo().getCurrentRoom().startWordQuiz(question.toString(), duration * 1000);
} }
return true; return true;