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

Merge branch 'general-devel' into fix-itemban

Browse source
This commit is contained in:
Chris 2017-05-14 20:55:10 +09:30 • committed by GitHub
commit 585a72bdf3
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -5207,7 +5207,7 @@ namespace TShockAPI
{ {
if (Main.npc[i].active && ((npcId == 0 && !Main.npc[i].townNPC && Main.npc[i].netID != NPCID.TargetDummy) || Main.npc[i].netID == npcId)) if (Main.npc[i].active && ((npcId == 0 && !Main.npc[i].townNPC && Main.npc[i].netID != NPCID.TargetDummy) || Main.npc[i].netID == npcId))
{ {
TSPlayer.Server.StrikeNPC(i, (int)(Main.npc[i].life + (Main.npc[i].defense * 0.5)), 0, 0); TSPlayer.Server.StrikeNPC(i, (int)(Main.npc[i].life + (Main.npc[i].defense * 0.6)), 0, 0);
kills++; kills++;
} }
} }

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit c22ec39f707f32e19fd59f685d59a79be8d12b5a Subproject commit a9d1b0e4e096ecbd0b2033ce4ff636759c9448c3

3
scripts/create_release.py
View file

@ -36,7 +36,7 @@ sqlite_bin_name = "Mono.Data.Sqlite.dll"
json_bin_name = "Newtonsoft.Json.dll" json_bin_name = "Newtonsoft.Json.dll"
http_bin_name = "HttpServer.dll" http_bin_name = "HttpServer.dll"
tshock_bin_name = "TShockAPI.dll" tshock_bin_name = "TShockAPI.dll"
tshock_symbols = "TShockAPI.dll.mdb" tshock_symbols = "TShockAPI.pdb"
bcrypt_bin_name = "BCrypt.Net.dll" bcrypt_bin_name = "BCrypt.Net.dll"
geoip_db_name = "GeoIP.dat" geoip_db_name = "GeoIP.dat"
@ -140,6 +140,7 @@ def upload_artifacts():
def update_terraria_source(): def update_terraria_source():
subprocess.check_call(['/usr/bin/git', 'submodule', 'init']) subprocess.check_call(['/usr/bin/git', 'submodule', 'init'])
subprocess.check_call(['/usr/bin/git', 'submodule', 'update']) subprocess.check_call(['/usr/bin/git', 'submodule', 'update'])
subprocess.check_call(['nuget', 'restore'])
subprocess.check_call(['nuget', 'restore', 'TerrariaServerAPI/']) subprocess.check_call(['nuget', 'restore', 'TerrariaServerAPI/'])
def run_bootstrapper(): def run_bootstrapper():