5 Commits

Author SHA1 Message Date
a084d39b02 Update version to v1.6.1 2023-06-04 20:05:50 +08:00
6c19c09c00 Fix deserialization formatting error (#185) 2023-06-04 20:05:32 +08:00
c6e0b51ea6 Fix deserialization formatting error 2023-06-03 00:27:34 +08:00
bcb88740f1 Upgrade to 1.6.0 2023-06-03 00:11:12 +08:00
290c4fbf8c DON'T LOCK PLAYER! 2023-05-21 21:41:37 +08:00
6 changed files with 15 additions and 14 deletions

View File

@@ -4,7 +4,7 @@ plugins {
} }
group 'com.github.jie65535.opencommand' group 'com.github.jie65535.opencommand'
version '1.5.2' version '1.6.1'
sourceCompatibility = 17 sourceCompatibility = 17
targetCompatibility = 17 targetCompatibility = 17

View File

@@ -44,13 +44,11 @@ public final class EventListeners {
* @param uid 玩家uid * @param uid 玩家uid
* @return 新的玩家消息处理类 * @return 新的玩家消息处理类
*/ */
public static StringBuilder getPlayerNewMessageHandler(int uid) { public static StringBuilder getPlayerMessageHandler(int uid) {
var handler = playerMessageHandlers.get(uid); var handler = playerMessageHandlers.get(uid);
if (handler == null) { if (handler == null) {
handler = new StringBuilder(); handler = new StringBuilder();
playerMessageHandlers.put(uid, handler); playerMessageHandlers.put(uid, handler);
} else {
handler.setLength(0);
} }
return handler; return handler;
} }

View File

@@ -58,7 +58,7 @@ public final class OpenCommandHandler implements Router {
var req = context.bodyAsClass(JsonRequest.class); var req = context.bodyAsClass(JsonRequest.class);
if (req.action.equals("sendCode")) { if (req.action.equals("sendCode")) {
int playerId = (int) req.data; int playerId = (int)Double.parseDouble(req.data.toString());
var player = plugin.getServer().getPlayerByUid(playerId); var player = plugin.getServer().getPlayerByUid(playerId);
if (player == null) { if (player == null) {
context.json(new JsonResponse(404, "Player Not Found.")); context.json(new JsonResponse(404, "Player Not Found."));
@@ -152,11 +152,12 @@ public final class OpenCommandHandler implements Router {
context.json(new JsonResponse(404, "Player not found")); context.json(new JsonResponse(404, "Player not found"));
return; return;
} }
//noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (player) {
// Player MessageHandler do not support concurrency // Player MessageHandler do not support concurrency
var handler = EventListeners.getPlayerNewMessageHandler(player.getUid()); var handler = EventListeners.getPlayerMessageHandler(player.getUid());
//noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (handler) {
try { try {
handler.setLength(0);
CommandMap.getInstance().invoke(player, player, command); CommandMap.getInstance().invoke(player, player, command);
context.json(new JsonResponse(handler.toString())); context.json(new JsonResponse(handler.toString()));
} catch (Exception e) { } catch (Exception e) {

View File

@@ -61,7 +61,7 @@ public final class OpenCommandOnlyHttpHandler implements Router {
var req = context.bodyAsClass(JsonRequest.class); var req = context.bodyAsClass(JsonRequest.class);
if (req.action.equals("sendCode")) { if (req.action.equals("sendCode")) {
int playerId = (int) req.data; int playerId = (int)Double.parseDouble(req.data.toString());
var player = SocketData.getPlayer(playerId); var player = SocketData.getPlayer(playerId);
if (player == null) { if (player == null) {
context.json(new JsonResponse(404, "Player Not Found.")); context.json(new JsonResponse(404, "Player Not Found."));

View File

@@ -159,11 +159,12 @@ public class SocketClient {
sendPacket(new HttpPacket(404, "Player not found."), packet.packetID); sendPacket(new HttpPacket(404, "Player not found."), packet.packetID);
return; return;
} }
//noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (playerData) {
// Player MessageHandler do not support concurrency // Player MessageHandler do not support concurrency
var handler = EventListeners.getPlayerNewMessageHandler(playerData.getUid()); var handler = EventListeners.getPlayerMessageHandler(playerData.getUid());
//noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (handler) {
try { try {
handler.setLength(0);
CommandMap.getInstance().invoke(playerData, playerData, command); CommandMap.getInstance().invoke(playerData, playerData, command);
sendPacket(new HttpPacket(200, handler.toString()), packet.packetID); sendPacket(new HttpPacket(200, handler.toString()), packet.packetID);
} catch (Exception e) { } catch (Exception e) {

View File

@@ -1,7 +1,8 @@
{ {
"name": "opencommand-plugin", "name": "opencommand-plugin",
"description": "Open command interface for third-party clients", "description": "Open command interface for third-party clients",
"version": "dev-1.5.2", "version": "1.6.1",
"mainClass": "com.github.jie65535.opencommand.OpenCommandPlugin", "mainClass": "com.github.jie65535.opencommand.OpenCommandPlugin",
"authors": ["jie65535", "方块君"] "authors": ["jie65535", "方块君"],
"api": 2
} }