fix: баги

- откат Nukkit-Mot - добавлен try-catch на отправку пакета
Reider745 · Dec 16, 2023 · ca15087 · ca15087
1 parent c1bedc7
commit ca15087
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/iclibs/Nukkit-MOT-SNAPSHOT.jar b/iclibs/Nukkit-MOT-SNAPSHOT.jar
diff --git a/src/main/java/com/reider745/entity/EntityMethod.java b/src/main/java/com/reider745/entity/EntityMethod.java
@@ -32,6 +32,14 @@ public static Entity getEntityToLong(long ent){
         return null;
     }
 
+    public static Player getPlayerToLong(long ent){
+        for (Level level : InnerCoreServer.server.getLevels().values())
+            for (Player entity : level.getPlayers().values())
+                if(entity.getId() == ent)
+                    return entity;
+        return null;
+    }
+
     public static EntityHuman getEntityHumanToLong(long ent){
         for (Level level : InnerCoreServer.server.getLevels().values())
             for (Entity entity : level.getEntities())

diff --git a/src/main/java/com/reider745/item/CustomItemClass.java b/src/main/java/com/reider745/item/CustomItemClass.java
@@ -32,6 +32,8 @@ public CustomItemClass(int id, Integer meta, int count, CustomManager manager) {
 
         CompoundTag tag = getOrCreateNamedTag();
 
+      //  tag.putInt("Damage", max_damage);
+
         CompoundTag components = tag.getCompound("components");
         if(components == null){
             components = new CompoundTag();

diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java
@@ -1,13 +1,17 @@
 package com.zhekasmirnov.apparatus.multiplayer.server;
 
+import cn.nukkit.Player;
 import cn.nukkit.network.protocol.SetLocalPlayerAsInitializedPacket;
+import com.reider745.InnerCoreServer;
+import com.reider745.entity.EntityMethod;
 import com.zhekasmirnov.apparatus.multiplayer.Network;
 import com.zhekasmirnov.apparatus.multiplayer.ThreadTypeMarker;
 import com.zhekasmirnov.apparatus.multiplayer.channel.ChannelInterface;
 import com.zhekasmirnov.apparatus.multiplayer.channel.data.DataChannel;
 import com.zhekasmirnov.apparatus.util.Java8BackComp;
 import com.zhekasmirnov.horizon.runtime.logger.Logger;
 import com.zhekasmirnov.innercore.api.InnerCoreConfig;
+import com.zhekasmirnov.innercore.api.log.ICLog;
 import org.json.JSONObject;
 
 import java.io.IOException;
@@ -191,11 +195,31 @@ public InitializationPacketException getInitializationPacketFailureCause() {
 
 
     public void send(String name, Object data) {
-        channel.send(name, data);
+        try{
+            channel.send(name, data);
+        }catch (Exception e){
+            ICLog.e("Network", "error send "+playerUid, e);
+
+            final Player player = EntityMethod.getPlayerToLong(playerUid);
+            if(player != null)
+                player.kick();
+            else
+                ICLog.i("Network", "error kick player");
+        }
     }
 
     public<T> void send(String name, T data, Class<T> dataType) {
-        channel.send(name, data, dataType);
+        try{
+            channel.send(name, data, dataType);
+        }catch (Exception e){
+            ICLog.e("Network", "error send "+playerUid, e);
+
+            final Player player = EntityMethod.getPlayerToLong(playerUid);
+            if(player != null)
+                player.kick();
+            else
+                ICLog.i("Network", "error kick player");
+        }
     }
 
     public void sendMessage(String message) {