themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed a possible bug causing TSPlayer.StrikeNPC to cause NullReferenceExceptions depending on the calling thread.

Browse source
This commit is contained in:
CoderCow 2013-07-22 12:12:02 +02:00
parent 56d17224b6
commit f4aa36b8d1
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/TSPlayer.cs
View file

@ -899,6 +899,10 @@ namespace TShockAPI
public void StrikeNPC(int npcid, int damage, float knockBack, int hitDirection) public void StrikeNPC(int npcid, int damage, float knockBack, int hitDirection)
{ {
// Main.rand is thread static.
if (Main.rand == null)
Main.rand = new Random();
Main.npc[npcid].StrikeNPC(damage, knockBack, hitDirection); Main.npc[npcid].StrikeNPC(damage, knockBack, hitDirection);
NetMessage.SendData((int) PacketTypes.NpcStrike, -1, -1, "", npcid, damage, knockBack, hitDirection); NetMessage.SendData((int) PacketTypes.NpcStrike, -1, -1, "", npcid, damage, knockBack, hitDirection);
} }