fix regex
This commit is contained in:
parent
ae9ccd4b51
commit
8a50aae2d0
2 changed files with 6 additions and 7 deletions
|
@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2g
|
||||||
baseGroup = xyz.stachel.bonzotimer
|
baseGroup = xyz.stachel.bonzotimer
|
||||||
mcVersion = 1.8.9
|
mcVersion = 1.8.9
|
||||||
modid = bonzo-timer
|
modid = bonzo-timer
|
||||||
version = 1.2.2
|
version = 1.2.4
|
||||||
org.gradle.java.installations.paths=/home/stachel/down/zulu8.84.0.15-ca-jdk8.0.442-linux_x64
|
org.gradle.java.installations.paths=/home/stachel/down/zulu8.84.0.15-ca-jdk8.0.442-linux_x64
|
||||||
|
|
|
@ -42,11 +42,11 @@ public class ChatHandler {
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onChatReceived(@NotNull ClientChatReceivedEvent event) {
|
public void onChatReceived(@NotNull ClientChatReceivedEvent event) {
|
||||||
if (event.type == 2) return;
|
if (event.type == 2) return;
|
||||||
final String message = event.message.getUnformattedText().trim().replaceAll("§[0-9a-f]", "");
|
final String strippedMessage = event.message.getUnformattedText().replaceAll("§[0-9a-fklmnor]", "").trim();
|
||||||
|
|
||||||
if (autotransferEnabled) {
|
if (autotransferEnabled) {
|
||||||
final Matcher transfer = TRANSFER_PATTERN.matcher(message);
|
final Matcher transfer = TRANSFER_PATTERN.matcher(strippedMessage);
|
||||||
final Matcher promote = PROMOTE_PATTERN.matcher(message);
|
final Matcher promote = PROMOTE_PATTERN.matcher(strippedMessage);
|
||||||
String newLeader = "";
|
String newLeader = "";
|
||||||
if (transfer.matches()) {
|
if (transfer.matches()) {
|
||||||
this.oldLeader = transfer.group(2);
|
this.oldLeader = transfer.group(2);
|
||||||
|
@ -61,7 +61,7 @@ public class ChatHandler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final Matcher partyChat = PARTY_PATTERN.matcher(message);
|
final Matcher partyChat = PARTY_PATTERN.matcher(strippedMessage);
|
||||||
if (partyChat.matches()) {
|
if (partyChat.matches()) {
|
||||||
final String partyMessage = partyChat.group(2);
|
final String partyMessage = partyChat.group(2);
|
||||||
final String user = partyChat.group(1);
|
final String user = partyChat.group(1);
|
||||||
|
@ -94,7 +94,7 @@ public class ChatHandler {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (message) {
|
switch (strippedMessage) {
|
||||||
case "Your Bonzo's Mask saved your life!":
|
case "Your Bonzo's Mask saved your life!":
|
||||||
case "Your ⚚ Bonzo's Mask saved your life!":
|
case "Your ⚚ Bonzo's Mask saved your life!":
|
||||||
Timer.setInstance(new Timer((byte) 60));
|
Timer.setInstance(new Timer((byte) 60));
|
||||||
|
@ -125,7 +125,6 @@ public class ChatHandler {
|
||||||
this.changeColor(1);
|
this.changeColor(1);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
BonzoTimer.getInstance().getLogger().debug(message);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue