diff --git a/TerrariaServerAPI/TerrariaApi.Server/EventArgs/NpcStrikeEventArgs.cs b/TerrariaServerAPI/TerrariaApi.Server/EventArgs/NpcStrikeEventArgs.cs index 5bff008..71a21f1 100644 --- a/TerrariaServerAPI/TerrariaApi.Server/EventArgs/NpcStrikeEventArgs.cs +++ b/TerrariaServerAPI/TerrariaApi.Server/EventArgs/NpcStrikeEventArgs.cs @@ -36,6 +36,7 @@ public bool Critical get; set; } + [Obsolete("NPC.StrikeNPC does not supply this value; it is always false and is ignored.")] public bool NoEffect { get; diff --git a/TerrariaServerAPI/TerrariaApi.Server/HookManager.cs b/TerrariaServerAPI/TerrariaApi.Server/HookManager.cs index 6cb1985..dd0b5f1 100644 --- a/TerrariaServerAPI/TerrariaApi.Server/HookManager.cs +++ b/TerrariaServerAPI/TerrariaApi.Server/HookManager.cs @@ -678,7 +678,7 @@ public HandlerCollection NpcStrike } internal bool InvokeNpcStrike( - NPC npc, ref int damage, ref float knockback, ref int hitDirection, ref bool crit, ref bool noEffect, + NPC npc, ref int damage, ref float knockback, ref int hitDirection, ref bool crit, ref bool fromNet, Player player) { NpcStrikeEventArgs args = new NpcStrikeEventArgs @@ -688,7 +688,6 @@ internal bool InvokeNpcStrike( KnockBack = knockback, HitDirection = hitDirection, Critical = crit, - NoEffect = noEffect, FromNet = fromNet, Player = player }; @@ -699,7 +698,6 @@ internal bool InvokeNpcStrike( knockback = args.KnockBack; hitDirection = args.HitDirection; crit = args.Critical; - noEffect = args.NoEffect; fromNet = args.FromNet; player = args.Player; return args.Handled; diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs index a638047..0bb7715 100644 --- a/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs +++ b/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs @@ -38,7 +38,7 @@ static void OnUpdateConnectedClients(object? sender, HookEvents.Terraria.Netplay args.OriginalMethod(); if (ServerApi.ForceUpdate) { - Terraria.Netplay.HasClients = true; + Terraria.Netplay.HasFullyConnectedClients = true; } } @@ -192,7 +192,7 @@ static void OnConnectionAccepted(object? sender, HookEvents.Terraria.Netplay.OnC } if (FindNextOpenClientSlot() == -1) { - Netplay.StopListening(); + Netplay.TcpListener?.StopListening(); } } diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/NpcHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/NpcHooks.cs index 1e248a0..958e4e7 100644 --- a/TerrariaServerAPI/TerrariaApi.Server/Hooking/NpcHooks.cs +++ b/TerrariaServerAPI/TerrariaApi.Server/Hooking/NpcHooks.cs @@ -52,7 +52,7 @@ static void OnStrike(NPC npc, HookEvents.Terraria.NPC.StrikeNPCEventArgs args) if (!args.ContinueExecution) return; if (args.entity is Player player) { - if (_hookManager.InvokeNpcStrike(npc, ref args.Damage, ref args.knockBack, ref args.hitDirection, ref args.crit, ref args.noEffect, ref args.fromNet, player)) + if (_hookManager.InvokeNpcStrike(npc, ref args.Damage, ref args.knockBack, ref args.hitDirection, ref args.crit, ref args.fromNet, player)) { args.ContinueExecution = false; args.HookReturnValue = 0; diff --git a/TerrariaServerAPI/TerrariaApi.Server/PacketTypes.cs b/TerrariaServerAPI/TerrariaApi.Server/PacketTypes.cs index 079d7ac..f1fc13c 100644 --- a/TerrariaServerAPI/TerrariaApi.Server/PacketTypes.cs +++ b/TerrariaServerAPI/TerrariaApi.Server/PacketTypes.cs @@ -159,8 +159,7 @@ public enum PacketTypes RequestSection = 159, SyncItemPosition = 160, HostToken = 161, - - // Mobile version packets - ServerInfo = 162, - PlayerPlatformInfo = 163 + DamageNPCAck = 162, + ServerInfo = 163, + PlayerPlatformInfo = 164 } diff --git a/TerrariaServerAPI/TerrariaServerAPI.csproj b/TerrariaServerAPI/TerrariaServerAPI.csproj index 61005da..fef687d 100644 --- a/TerrariaServerAPI/TerrariaServerAPI.csproj +++ b/TerrariaServerAPI/TerrariaServerAPI.csproj @@ -23,6 +23,6 @@ - +