Skip to content

Bump OTAPI to 3.3.12 for Terraria 1.4.5.7 support #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hufang360 wants to merge 1 commit into
base: general-devel
Choose a base branch
from
Open

Bump OTAPI to 3.3.12 for Terraria 1.4.5.7 support #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -192,7 +192,7 @@ static void OnConnectionAccepted(object? sender, HookEvents.Terraria.Netplay.OnC
}
if (FindNextOpenClientSlot() == -1)
{
Netplay.StopListening();
Netplay.TcpListener?.StopListening();
}
}

Expand Down
5 changes: 4 additions & 1 deletion TerrariaServerAPI/TerrariaApi.Server/Hooking/NpcHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ 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))
// 1.4.5.7 removed the noEffect parameter from NPC.StrikeNPC, so it is
// not part of the OTAPI hook args anymore; keep the internal API intact.
bool noEffect = false;
if (_hookManager.InvokeNpcStrike(npc, ref args.Damage, ref args.knockBack, ref args.hitDirection, ref args.crit, ref noEffect, ref args.fromNet, player))
{
args.ContinueExecution = false;
args.HookReturnValue = 0;
Expand Down
6 changes: 4 additions & 2 deletions TerrariaServerAPI/TerrariaApi.Server/PacketTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,10 @@ public enum PacketTypes
RequestSection = 159,
SyncItemPosition = 160,
HostToken = 161,

// Mobile version packets
// 1.4.5.7: 162 is the NPC strike acknowledgement (DamageNPCAck).
// The old mobile-only aliases are kept as same-value members for API compatibility,
// matching how OTAPI retains deprecated members for older plugins.
DamageNPCAck = 162,
ServerInfo = 162,
PlayerPlatformInfo = 163
}
2 changes: 1 addition & 1 deletion TerrariaServerAPI/TerrariaServerAPI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
<PackageReference Include="OTAPI.Upcoming" Version="3.3.11" />
<PackageReference Include="OTAPI.Upcoming" Version="3.3.12" />
</ItemGroup>
</Project>