Skip to content

Commit b7efad7

Browse files
committed
Фикс цветов
1 parent 30d97f9 commit b7efad7

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

BukkitLauncher/src/main/java/ru/spliterash/vkchat/launchers/bukkit/listeners/BukkitDieListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ public BukkitDieListener(IDieListener listener) {
1919

2020
@EventHandler(ignoreCancelled = true)
2121
public void onMessage(PlayerDeathEvent e) {
22-
listener.onDie((AbstractPlayer) BukkitPlugin.wrapSender(e.getEntity()), ChatColor.stripColor(e.getDeathMessage()));
22+
listener.onDie((AbstractPlayer) BukkitPlugin.wrapSender(e.getEntity()), e.getDeathMessage());
2323
}
2424
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ allprojects {
1818
}
1919

2020
group = 'ru.spliterash'
21-
version = '3.0.3'
21+
version = '3.0.4'
2222

2323
sourceCompatibility = 1.8
2424
targetCompatibility = 1.8

conf.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-libraryjars 'C:\Program Files\Java\jre1.8.0_261\lib\rt.jar'
1+
-libraryjars 'C:\Program Files\Java\jre1.8.0_271\lib\rt.jar'
22
-printmapping 'VkChat.map'
33
-keepattributes *Annotation*,SourceFile,LineNumberTable,Signature
44
#-dontnote

src/main/java/ru/spliterash/vkchat/VkChat.java

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,20 @@ public static void onDisable(boolean serverDisable) {
123123
}
124124

125125
private static void sendMessage(VkApiClient client, GroupActor actor, int peer, String message) {
126-
try {
127-
client
128-
.messages()
129-
.send(actor)
130-
.peerId(peer)
131-
.randomId(random.nextInt())
132-
.disableMentions(true)
133-
.message(message)
134-
.execute();
135-
} catch (Exception e) {
136-
e.printStackTrace();
126+
if (message != null) {
127+
message = ChatColor.stripColor(message);
128+
try {
129+
client
130+
.messages()
131+
.send(actor)
132+
.peerId(peer)
133+
.randomId(random.nextInt())
134+
.disableMentions(true)
135+
.message(message)
136+
.execute();
137+
} catch (Exception e) {
138+
e.printStackTrace();
139+
}
137140
}
138141
}
139142

@@ -330,7 +333,7 @@ private void processMessages(Message message) {
330333
if (s == null || s.length == 0)
331334
commandReply = Lang.CONSOLE_COMMAND.toString();
332335
else
333-
commandReply = ChatColor.stripColor(String.join("\n", s));
336+
commandReply = String.join("\n", s);
334337
sendMessage(message.getPeerId(), commandReply);
335338
}));
336339
} else if (text.startsWith("verify ")) {

0 commit comments

Comments
 (0)