fixed nullptr exception, typo
This commit is contained in:
parent
4ab94cd179
commit
ae9ccd4b51
2 changed files with 5 additions and 5 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.1.2
|
version = 1.2.2
|
||||||
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
|
||||||
|
|
|
@ -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 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 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 static final String[] COLOR_MAPPING = { "§6ORANGE", "§aGREEN", "§4RED" ,"§9BLUE", "§5PRPLX" };
|
||||||
private int transferCountdown = 10;
|
private int transferCountdown = 0;
|
||||||
private boolean autotransferEnabled;
|
private boolean autotransferEnabled = false;
|
||||||
private int colorChangeCooldown = 0;
|
private int colorChangeCooldown = 0;
|
||||||
private int color = 0;
|
private int color = 0;
|
||||||
private String oldLeader = null;
|
private String oldLeader = null;
|
||||||
|
@ -33,7 +33,7 @@ public class ChatHandler {
|
||||||
}
|
}
|
||||||
if (transferCountdown > 1) {
|
if (transferCountdown > 1) {
|
||||||
transferCountdown--;
|
transferCountdown--;
|
||||||
} else if (transferCountdown == 1) {
|
} else if (transferCountdown == 1 && Minecraft.getMinecraft().thePlayer != null && this.oldLeader != null) {
|
||||||
transferCountdown--;
|
transferCountdown--;
|
||||||
Minecraft.getMinecraft().thePlayer.sendChatMessage("/p transfer " + this.oldLeader);
|
Minecraft.getMinecraft().thePlayer.sendChatMessage("/p transfer " + this.oldLeader);
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ public class ChatHandler {
|
||||||
case "!autotransfer on":
|
case "!autotransfer on":
|
||||||
autotransferEnabled = true;
|
autotransferEnabled = true;
|
||||||
break;
|
break;
|
||||||
case "!autotranfer off":
|
case "!autotransfer off":
|
||||||
autotransferEnabled = false;
|
autotransferEnabled = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue