diff --git a/gradle.properties b/gradle.properties index d737480..a521415 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2g baseGroup = xyz.stachel.bonzotimer mcVersion = 1.8.9 modid = bonzo-timer -version = 1.1.2 +version = 1.2.2 org.gradle.java.installations.paths=/home/stachel/down/zulu8.84.0.15-ca-jdk8.0.442-linux_x64 diff --git a/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java b/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java index ae637df..9696165 100644 --- a/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java +++ b/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java @@ -18,8 +18,8 @@ public class ChatHandler { private static final Pattern TRANSFER_PATTERN = Pattern.compile("The party was transferred to (?:\\[(?:VIP\\+?|MVP\\+{0,2}|YOUTUBE|MOD|ADMIN)\\] )?([a-zA-Z0-9_]{2,16}) by (?:\\[(?:VIP\\+?|MVP\\+{0,2}|YOUTUBE|MOD|ADMIN)\\] )?([a-zA-Z0-9_]{2,16})"); private static final Pattern PROMOTE_PATTERN = Pattern.compile("(?:\\[(?:VIP\\+?|MVP\\+{0,2}|YOUTUBE|MOD|ADMIN)\\])?([a-zA-Z0-9_]{2,16}) has promoted (?:\\[(?:VIP\\+?|MVP\\+{0,2}|YOUTUBE|MOD|ADMIN)\\] )?([a-zA-Z0-9_]{2,16}) to Party Leader"); private static final String[] COLOR_MAPPING = { "§6ORANGE", "§aGREEN", "§4RED" ,"§9BLUE", "§5PRPLX" }; - private int transferCountdown = 10; - private boolean autotransferEnabled; + private int transferCountdown = 0; + private boolean autotransferEnabled = false; private int colorChangeCooldown = 0; private int color = 0; private String oldLeader = null; @@ -33,7 +33,7 @@ public class ChatHandler { } if (transferCountdown > 1) { transferCountdown--; - } else if (transferCountdown == 1) { + } else if (transferCountdown == 1 && Minecraft.getMinecraft().thePlayer != null && this.oldLeader != null) { transferCountdown--; Minecraft.getMinecraft().thePlayer.sendChatMessage("/p transfer " + this.oldLeader); } @@ -89,7 +89,7 @@ public class ChatHandler { case "!autotransfer on": autotransferEnabled = true; break; - case "!autotranfer off": + case "!autotransfer off": autotransferEnabled = false; break; }