Skip to content

Commit fe6a491

Browse files
committed
Исправление варнов.
1 parent 59db5d3 commit fe6a491

3 files changed

Lines changed: 16 additions & 6 deletions

File tree

.github/workflows/build-and-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ jobs:
153153
- name: Create GitHub Release
154154
uses: softprops/action-gh-release@v2
155155
with:
156+
prerelease: true
156157
tag_name: v${{ needs.extract-version.outputs.version }}
157158
name: v${{ needs.extract-version.outputs.version }}
158159
body: ${{ steps.generate_changelog.outputs.CHANGELOG }}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.trassert</groupId>
66
<artifactId>ChatToHttp</artifactId>
7-
<version>1.5.5</version>
7+
<version>1.5.6-beta</version>
88

99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/trassert/chattohttp/ChatToHttpPlugin.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
import org.bukkit.event.EventHandler;
44
import org.bukkit.event.Listener;
5-
import org.bukkit.event.player.AsyncPlayerChatEvent;
5+
import io.papermc.paper.event.player.AsyncChatEvent;
66
import org.bukkit.plugin.java.JavaPlugin;
77
import org.bukkit.command.Command;
88
import org.bukkit.command.CommandSender;
99
import org.bukkit.entity.Player;
10+
import org.jetbrains.annotations.NotNull;
11+
import org.jspecify.annotations.NonNull;
12+
13+
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
1014

1115
import java.io.IOException;
1216
import java.net.HttpURLConnection;
@@ -25,11 +29,15 @@ public void onEnable() {
2529
saveDefaultConfig();
2630
reloadConfig();
2731
getServer().getPluginManager().registerEvents(this, this);
28-
getCommand("c2h").setExecutor(this);
32+
var command = getCommand("c2h");
33+
if (command != null) {
34+
command.setExecutor(this);
35+
}
2936
}
3037

3138
@Override
32-
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
39+
public boolean onCommand(@NonNull CommandSender sender, @NonNull Command command, @NonNull String label,
40+
@NotNull String[] args) {
3341
if (!command.getName().equalsIgnoreCase("c2h")) {
3442
return false;
3543
}
@@ -60,14 +68,15 @@ public void reloadConfig() {
6068
}
6169

6270
@EventHandler
63-
public void onPlayerChat(AsyncPlayerChatEvent event) {
71+
public void onPlayerChat(AsyncChatEvent event) {
6472
if (webhookUrl == null || password == null) {
6573
getLogger().warning("webhook-url или password не заданы в конфиге.");
6674
return;
6775
}
6876

77+
var serializer = PlainTextComponentSerializer.builder().build();
6978
String nick = event.getPlayer().getName();
70-
String message = event.getMessage();
79+
String message = serializer.serialize(event.message());
7180

7281
String encodedNick = URLEncoder.encode(nick, StandardCharsets.UTF_8);
7382
String encodedMessage = URLEncoder.encode(message, StandardCharsets.UTF_8);

0 commit comments

Comments
 (0)