Skip to content

fix/terraria 1.4.5.7/.8 port #283

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
bulkinglb wants to merge 4 commits into
base: general-devel
Choose a base branch
from
Open

fix/terraria 1.4.5.7/.8 port #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f64b87e
Bump OTAPI to 3.3.12 for Terraria 1.4.5.7 support
hufang360 Aug 22, 2026
5acdf88
chore: bump OTAPI to 3.3.14
bulkinglb Aug 22, 2026
7d3596c
fix: move the mobile packet ids to the end of the enum
bulkinglb Aug 24, 2026
e6f3b40
refactor: deprecate NoEffect on NpcStrikeEventArgs
bulkinglb Aug 24, 2026
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
1 change: 1 addition & 0 deletions TerrariaServerAPI/TerrariaApi.Server/EventArgs/NpcStrikeEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions TerrariaServerAPI/TerrariaApi.Server/HookManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ public HandlerCollection<NpcStrikeEventArgs> 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
Expand All @@ -688,7 +688,6 @@ internal bool InvokeNpcStrike(
KnockBack = knockback,
HitDirection = hitDirection,
Critical = crit,
NoEffect = noEffect,
FromNet = fromNet,
Player = player
};
Expand All @@ -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;
Expand Down
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
2 changes: 1 addition & 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,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;
Expand Down
7 changes: 3 additions & 4 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,7 @@ public enum PacketTypes
RequestSection = 159,
SyncItemPosition = 160,
HostToken = 161,

// Mobile version packets
ServerInfo = 162,
PlayerPlatformInfo = 163
DamageNPCAck = 162,
ServerInfo = 163,
PlayerPlatformInfo = 164
}
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.14" />
</ItemGroup>
</Project>