nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-27 00:40:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-random speech.java

Browse Source
This commit is contained in:
Oliver 2024-05-12 20:33:32 +00:00
parent dfb97f37e9
commit 112e1ff377
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/eu/habbo/habbohotel/bots/Bot.java
View File

@ -43,11 +43,11 @@ public class Bot implements Runnable {
private short chatDelay; private short chatDelay;
private int chatTimeOut; private int chatTimeOut;
private int chatTimestamp; private int chatTimestamp;
private short lastChatIndex; private int lastChatIndex;
private int bubble; private int bubble;
private String type; private final String type;
private int effect; private int effect;
@ -187,9 +187,7 @@ public class Bot implements Runnable {
if (!this.chatLines.isEmpty() && this.chatTimeOut <= Emulator.getIntUnixTimestamp() && this.chatAuto) { if (!this.chatLines.isEmpty() && this.chatTimeOut <= Emulator.getIntUnixTimestamp() && this.chatAuto) {
if (this.room != null) { if (this.room != null) {
this.lastChatIndex = (this.chatRandom ? (short) Emulator.getRandom().nextInt(this.chatLines.size()) : (this.lastChatIndex == (this.chatLines.size() - 1) ? 0 : this.lastChatIndex++)); if (this.lastChatIndex < 0 || this.lastChatIndex >= this.chatLines.size()) {
if (this.lastChatIndex >= this.chatLines.size()) {
this.lastChatIndex = 0; this.lastChatIndex = 0;
} }
@ -204,9 +202,19 @@ public class Bot implements Runnable {
this.talk(message); this.talk(message);
} }
if (this.chatRandom) {
this.lastChatIndex = (short) Emulator.getRandom().nextInt(this.chatLines.size());
} else {
this.lastChatIndex++;
if (this.lastChatIndex >= this.chatLines.size()) {
this.lastChatIndex = 0; // start from scratch :-3
}
}
this.chatTimeOut = Emulator.getIntUnixTimestamp() + this.chatDelay; this.chatTimeOut = Emulator.getIntUnixTimestamp() + this.chatDelay;
} }
} }
} }
} }
@ -420,6 +428,11 @@ public class Bot implements Runnable {
return this.effect; return this.effect;
} }
public void setBubble(int bubble) {
this.bubble = bubble;
this.needsUpdate = true;
}
public void setEffect(int effect, int duration) { public void setEffect(int effect, int duration) {
this.effect = effect; this.effect = effect;
this.needsUpdate = true; this.needsUpdate = true;