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

Terraria 1.3.5 changes compile (NO GUARANTEES ON EXECUTING)

Browse source
This commit is contained in:
Lucas Nicodemus 2017-04-19 18:21:34 -06:00
parent b8dbdb9ff4
commit 2d14533172
No known key found for this signature in database
GPG key ID: CEE668CCE1BF2C7C
7 changed files with 279 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

17
TShockAPI/TSServerPlayer.cs
View file

@ -24,6 +24,7 @@ using Terraria;
using Terraria.Utilities;
using TShockAPI;
using TShockAPI.DB;
using Terraria.Localization;
namespace TShockAPI
{
@ -152,15 +153,11 @@ namespace TShockAPI
TShock.Utils.GetRandomClearTileWithInRange(startTileX, startTileY, tileXRange, tileYRange, out spawnTileX,
out spawnTileY);
int npcid = NPC.NewNPC(spawnTileX * 16, spawnTileY * 16, type, 0);
// This is for special slimes
if (type == 1)
{
Main.npc[npcid].SetDefaults(name);
}
else
{
Main.npc[npcid].netDefaults(type);
}
// TODO: If special slimes break look at the git blame for this spot
// It's probably because I removed something that didn't work
Main.npc[npcid].SetDefaults(type);
}
}
@ -171,7 +168,7 @@ namespace TShockAPI
Main.rand = new UnifiedRandom();
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, NetworkText.FromLiteral(""), npcid, damage, knockBack, hitDirection);
}
public void RevertTiles(Dictionary<Vector2, ITile> tiles)