feat: исправлена броня

- добавлен ServerPlayerLeft
- добавлено дебаг сообщение в ConnectionClient
- исправлено что броня ic2 ломается
- обноалён Nukkit-Mot
This commit is contained in:
Reider745
2023-12-21 08:06:41 +03:00
parent 0dfa60d9e8
commit 0c04a632ba
7 changed files with 11 additions and 4 deletions
Binary file not shown.
@@ -4,6 +4,7 @@ import cn.nukkit.Server;
import cn.nukkit.plugin.PluginDescription;
import cn.nukkit.plugin.PluginManager;
import cn.nukkit.utils.MainLogger;
import com.reider745.api.CallbackHelper;
import com.reider745.block.CustomBlock;
import com.reider745.commands.CommandsHelper;
@@ -203,7 +204,7 @@ public class InnerCoreServer {
PATH = server.getDataPath();
InnerCoreServer.server = server;
InnerCoreServer.ic_server = this;
com.zhekasmirnov.horizon.runtime.logger.Logger.server = server;
Logger.server = server;
CallbackHelper.init();
NukkitIdConvertor.init();
@@ -40,7 +40,7 @@ public class CustomItemClass extends Item {
this.slot = parameters.get(PropertiesNames.Armors.SLOT, -1);
this.defense = parameters.get(PropertiesNames.Armors.DEFENSE, 0);
this.knockbackResist = parameters.get(PropertiesNames.Armors.KNOCKBACK_RESIST, 0f);
this.ARMOR_DAMAGEABLE = parameters.get(PropertiesNames.ARMOR_DAMAGEABLE, false);
this.ARMOR_DAMAGEABLE = !parameters.get(PropertiesNames.ARMOR_DAMAGEABLE, true);
CompoundTag tag = getOrCreateNamedTag();
CompoundTag components = tag.getCompound("components");
@@ -3,6 +3,7 @@ package com.zhekasmirnov.apparatus.api.player;
import com.zhekasmirnov.apparatus.multiplayer.Network;
import com.zhekasmirnov.apparatus.multiplayer.server.ConnectedClient;
import com.zhekasmirnov.innercore.api.NativeAPI;
import com.zhekasmirnov.innercore.api.runtime.Callback;
//import com.zhekasmirnov.innercore.api.runtime.Callback;
import java.util.HashMap;
@@ -42,7 +43,7 @@ public class NetworkPlayerRegistry {
synchronized (handlerMap) {
NetworkPlayerHandler handler = handlerMap.remove(client.getPlayerUid());
if (handler != null) {
//Network.getSingleton().getServerThreadJobExecutor().add(() -> Callback.invokeAPICallback("ServerPlayerLeft", handler.getActor().getUid()));
Network.getSingleton().getServerThreadJobExecutor().add(() -> Callback.invokeAPICallback("ServerPlayerLeft", handler.getActor().getUid()));
}
}
}
@@ -198,6 +198,8 @@ public class ConnectedClient extends Thread implements ChannelInterface.OnPacket
try{
if(!channel.isClosed())
channel.send(name, data);
else
ICLog.i("Network", "error send packet, socket close");
}catch (Throwable e){
ICLog.e("Network", "error send "+playerUid, e);
@@ -213,6 +215,8 @@ public class ConnectedClient extends Thread implements ChannelInterface.OnPacket
try{
if(!channel.isClosed())
channel.send(name, data, dataType);
else
ICLog.i("Network", "error send packet, socket close");
}catch (Throwable e){
ICLog.e("Network", "error send "+playerUid, e);
@@ -3,9 +3,9 @@ package com.zhekasmirnov.horizon.runtime.logger;
import java.io.PrintWriter;
import java.io.StringWriter;
import cn.nukkit.Server;
import org.mozilla.javascript.RhinoException;
import cn.nukkit.Server;
public class Logger {
public static Server server;
@@ -39,6 +39,7 @@ import com.zhekasmirnov.innercore.api.mod.recipes.workbench.WorkbenchRecipeRegis
import com.zhekasmirnov.innercore.api.mod.ui.window.WindowProvider;
import com.zhekasmirnov.innercore.api.mod.util.InventorySource;
import com.zhekasmirnov.innercore.api.runtime.*;
import com.zhekasmirnov.innercore.api.runtime.other.ArmorRegistry;
import com.zhekasmirnov.innercore.api.runtime.other.NameTranslation;
import com.zhekasmirnov.innercore.api.runtime.other.WorldGen;
import com.zhekasmirnov.innercore.api.runtime.saver.world.WorldDataSaverHandler;